This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7.gorm-scaling in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 2f7b39623cbed3f044ae39f24531083176ffba59 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed May 20 11:49:07 2026 -0500 codenarc and codestyle --- .../main/groovy/grails/orm/hibernate/HibernateEntity.groovy | 1 - .../orm/hibernate/AbstractHibernateGormStaticApi.groovy | 1 - .../grails/orm/hibernate/TenantBoundHibernateTemplate.groovy | 2 -- .../main/groovy/grails/gorm/hibernate/HibernateEntity.groovy | 1 - .../grails/orm/hibernate/TenantBoundHibernateTemplate.groovy | 2 -- .../groovy/org/grails/datastore/gorm/AbstractGormApi.groovy | 4 +--- .../main/groovy/org/grails/datastore/gorm/GormEntity.groovy | 5 ----- .../groovy/org/grails/datastore/gorm/GormInstanceApi.groovy | 3 --- .../org/grails/datastore/gorm/GormInstanceApiRegistry.groovy | 1 - .../main/groovy/org/grails/datastore/gorm/GormRegistry.groovy | 11 +++++------ .../org/grails/datastore/gorm/GormStaticApiRegistry.groovy | 1 - .../groovy/org/grails/datastore/gorm/GormValidationApi.groovy | 6 ------ .../grails/datastore/gorm/GormValidationApiRegistry.groovy | 1 - .../testing/tck/tests/DirtyCheckingAfterListenerSpec.groovy | 1 - 14 files changed, 6 insertions(+), 34 deletions(-) diff --git a/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy b/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy index 608fe348f7..4537c970ef 100644 --- a/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy +++ b/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy @@ -23,7 +23,6 @@ import groovy.transform.CompileStatic import groovy.transform.Generated import org.grails.datastore.gorm.GormEntity -import org.grails.datastore.gorm.GormRegistry import org.grails.orm.hibernate.AbstractHibernateGormStaticApi /** diff --git a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy index f74aa3abb7..3d2043785d 100644 --- a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy +++ b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy @@ -96,7 +96,6 @@ abstract class AbstractHibernateGormStaticApi<D> extends GormStaticApi<D> { return template } - protected ConversionService getConversionService() { getHibernateDatastore().mappingContext.conversionService } diff --git a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy index 586ea25b70..d9fa9b23cf 100644 --- a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy +++ b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy @@ -25,8 +25,6 @@ import org.hibernate.SessionFactory import org.hibernate.query.Query import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore import grails.gorm.multitenancy.Tenants -import java.io.Serializable -import java.util.Collection /** * A {@link IHibernateTemplate} implementation that binds a tenant id for the duration of the execution diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy index 3d0c30eb31..208d16e5f7 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy @@ -24,7 +24,6 @@ import groovy.transform.Generated import org.codehaus.groovy.runtime.InvokerHelper import org.grails.datastore.gorm.GormEntity -import org.grails.datastore.gorm.GormRegistry import org.grails.datastore.mapping.model.PersistentEntity import org.grails.datastore.mapping.model.types.Association import org.grails.datastore.mapping.model.types.ToOne diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy index dd2b11b6c3..7512d2c43a 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/TenantBoundHibernateTemplate.groovy @@ -24,8 +24,6 @@ import org.hibernate.SessionFactory import org.hibernate.query.Query import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore import grails.gorm.multitenancy.Tenants -import java.io.Serializable -import java.util.Collection /** * A {@link IHibernateTemplate} implementation that binds a tenant id for the duration of the execution diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy index e0767abdca..8638726dfb 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy @@ -35,8 +35,6 @@ import org.grails.datastore.mapping.core.DatastoreUtils import org.grails.datastore.mapping.core.SessionCallback import org.grails.datastore.mapping.core.VoidSessionCallback import org.grails.datastore.mapping.core.connections.ConnectionSource -import org.grails.datastore.mapping.core.connections.ConnectionSourcesProvider -import org.grails.datastore.mapping.core.connections.ConnectionSources import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore import grails.gorm.multitenancy.CurrentTenantHolder import grails.gorm.multitenancy.Tenants @@ -99,7 +97,7 @@ abstract class AbstractGormApi<D> extends AbstractDatastoreApi { String currentQualifier = getQualifier() boolean isMultiTenantCapable = ds instanceof MultiTenantCapableDatastore - boolean isMultiTenantEntity = MultiTenant.class.isAssignableFrom(persistentClass) + boolean isMultiTenantEntity = MultiTenant.isAssignableFrom(persistentClass) // Check if we have a non-default qualifier if (currentQualifier != null && !ConnectionSource.DEFAULT.equals(currentQualifier) && !ConnectionSource.OLD_DEFAULT.equalsIgnoreCase(currentQualifier)) { diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy index 1e467ce894..39f862aad4 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy @@ -38,11 +38,6 @@ import org.grails.datastore.mapping.model.types.OneToMany import org.grails.datastore.mapping.model.types.ToOne import org.grails.datastore.mapping.query.api.BuildableCriteria import org.grails.datastore.mapping.query.api.Criteria -import org.grails.datastore.mapping.core.Datastore -import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore -import grails.gorm.multitenancy.CurrentTenantHolder -import grails.gorm.multitenancy.Tenants -import grails.gorm.MultiTenant import org.grails.datastore.mapping.reflect.EntityReflector /** diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy index 1af33c7f51..cc342e6822 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy @@ -36,9 +36,6 @@ import org.grails.datastore.mapping.transactions.TransactionCapableDatastore import org.grails.datastore.mapping.dirty.checking.DirtyCheckable import org.grails.datastore.gorm.schemaless.DynamicAttributes -import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore -import grails.gorm.multitenancy.Tenants -import grails.gorm.MultiTenant import org.grails.datastore.mapping.core.DatastoreUtils /** diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApiRegistry.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApiRegistry.groovy index 91ae282bac..20482108aa 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApiRegistry.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApiRegistry.groovy @@ -20,7 +20,6 @@ package org.grails.datastore.gorm import groovy.transform.CompileStatic import org.grails.datastore.mapping.core.Datastore -import org.grails.datastore.mapping.core.connections.ConnectionSource import org.grails.datastore.mapping.model.MappingContext @CompileStatic diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormRegistry.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormRegistry.groovy index ec78b44956..695d6c58de 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormRegistry.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormRegistry.groovy @@ -19,7 +19,6 @@ package org.grails.datastore.gorm import groovy.transform.CompileDynamic -import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.grails.datastore.mapping.core.Datastore import org.grails.datastore.mapping.core.connections.ConnectionSource @@ -187,7 +186,7 @@ class GormRegistry { PlatformTransactionManager findSingleTransactionManager(String qualifier) { Datastore ds = getDatastoreByString((String) null, qualifier) if (ds == null) { - throw new IllegalStateException("No GORM implementations configured. Ensure GORM has been initialized correctly") + throw new IllegalStateException('No GORM implementations configured. Ensure GORM has been initialized correctly') } if (ds instanceof TransactionCapableDatastore) { return ((TransactionCapableDatastore) ds).transactionManager @@ -201,7 +200,7 @@ class GormRegistry { PlatformTransactionManager findTransactionManager(Class entityClass, String qualifier) { Datastore ds = getDatastore(entityClass, qualifier) if (ds == null) { - throw new IllegalStateException("No GORM implementations configured. Ensure GORM has been initialized correctly") + throw new IllegalStateException('No GORM implementations configured. Ensure GORM has been initialized correctly') } if (ds instanceof TransactionCapableDatastore) { return ((TransactionCapableDatastore) ds).transactionManager @@ -424,7 +423,7 @@ class GormRegistry { String normalizedClassName = normalizeEntityKey(entityClass) String normalizedQualifier = normalizeQualifier(qualifier) - if (MultiTenant.class.isAssignableFrom(entityClass)) { + if (MultiTenant.isAssignableFrom(entityClass)) { // Priority 1: Explicit qualifier that doesn't match default is likely a tenant ID if (!ConnectionSource.DEFAULT.equals(normalizedQualifier)) { GormStaticApi api = staticApiRegistry.getDirect(normalizedClassName, normalizedQualifier) @@ -460,7 +459,7 @@ class GormRegistry { String normalizedClassName = normalizeEntityKey(entityClass) String normalizedQualifier = normalizeQualifier(qualifier) - if (MultiTenant.class.isAssignableFrom(entityClass)) { + if (MultiTenant.isAssignableFrom(entityClass)) { if (!ConnectionSource.DEFAULT.equals(normalizedQualifier)) { GormInstanceApi api = instanceApiRegistry.getDirect(normalizedClassName, normalizedQualifier) if (api != null) return api @@ -492,7 +491,7 @@ class GormRegistry { String normalizedClassName = normalizeEntityKey(entityClass) String normalizedQualifier = normalizeQualifier(qualifier) - if (MultiTenant.class.isAssignableFrom(entityClass)) { + if (MultiTenant.isAssignableFrom(entityClass)) { if (!ConnectionSource.DEFAULT.equals(normalizedQualifier)) { GormValidationApi api = validationApiRegistry.getDirect(normalizedClassName, normalizedQualifier) if (api != null) return api diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApiRegistry.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApiRegistry.groovy index a49936348d..0a05f3dcfb 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApiRegistry.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApiRegistry.groovy @@ -20,7 +20,6 @@ package org.grails.datastore.gorm import groovy.transform.CompileStatic import org.grails.datastore.mapping.core.Datastore -import org.grails.datastore.mapping.core.connections.ConnectionSource import org.grails.datastore.mapping.model.MappingContext @CompileStatic diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy index e225ac7bce..bc703e6258 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy @@ -36,7 +36,6 @@ import org.grails.datastore.mapping.core.Datastore import org.grails.datastore.mapping.core.DatastoreUtils import org.grails.datastore.mapping.core.Session import org.grails.datastore.mapping.core.SessionCallback -import org.grails.datastore.mapping.core.VoidSessionCallback import org.grails.datastore.mapping.engine.event.ValidationEvent import org.grails.datastore.mapping.model.MappingContext import org.grails.datastore.mapping.model.PersistentEntity @@ -45,11 +44,6 @@ import org.grails.datastore.mapping.reflect.ClassUtils import org.grails.datastore.mapping.validation.ValidationErrors import org.grails.datastore.mapping.transactions.TransactionCapableDatastore -import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore -import grails.gorm.multitenancy.Tenants -import grails.gorm.multitenancy.CurrentTenantHolder -import grails.gorm.MultiTenant - /** * Methods used for validating GORM instances. * diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApiRegistry.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApiRegistry.groovy index e8c06fed88..c5748d033b 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApiRegistry.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApiRegistry.groovy @@ -20,7 +20,6 @@ package org.grails.datastore.gorm import groovy.transform.CompileStatic import org.grails.datastore.mapping.core.Datastore -import org.grails.datastore.mapping.core.connections.ConnectionSource import org.grails.datastore.mapping.model.MappingContext @CompileStatic diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DirtyCheckingAfterListenerSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DirtyCheckingAfterListenerSpec.groovy index 37daa03120..ac67dc55ce 100644 --- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DirtyCheckingAfterListenerSpec.groovy +++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DirtyCheckingAfterListenerSpec.groovy @@ -29,7 +29,6 @@ import org.grails.datastore.mapping.engine.event.PreUpdateEvent import org.springframework.context.ApplicationEvent import org.springframework.context.ApplicationEventPublisher import org.springframework.context.ConfigurableApplicationContext -import spock.lang.PendingFeatureIf import spock.util.concurrent.PollingConditions class DirtyCheckingAfterListenerSpec extends GrailsDataTckSpec {
