This is an automated email from the ASF dual-hosted git repository.

matrei pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git


The following commit(s) were added to refs/heads/8.0.x-hibernate7 by this push:
     new 2b11a80fd8 refactor: use `registerDomainClasses()` method
2b11a80fd8 is described below

commit 2b11a80fd82daffbf68e2a9b6f1a226cec27e594
Author: Mattias Reichel <[email protected]>
AuthorDate: Mon Jun 15 17:15:33 2026 +0200

    refactor: use `registerDomainClasses()` method
---
 .agents/skills/hibernate-developer/SKILL.md                           | 2 +-
 .../test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy | 2 +-
 .../grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy  | 2 +-
 .../src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy     | 2 +-
 .../groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy  | 2 +-
 .../org/grails/orm/hibernate/proxy/HibernateProxyHandler5Spec.groovy  | 2 +-
 .../src/test/groovy/grails/gorm/tests/AddToManagedEntitySpec.groovy   | 2 +-
 .../test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy  | 4 ++--
 .../test/groovy/grails/gorm/tests/HibernatePagedResultListSpec.groovy | 2 +-
 .../core/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy  | 2 +-
 .../core/src/test/groovy/grails/gorm/tests/PagedResultListSpec.groovy | 2 +-
 .../core/src/test/groovy/grails/gorm/tests/RLikeHibernate7Spec.groovy | 2 +-
 .../groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy   | 2 +-
 .../groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy | 2 +-
 .../tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy  | 2 +-
 .../gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy | 2 +-
 .../gorm/tests/detachedcriteria/DetachCriteriaSubquerySpec.groovy     | 2 +-
 .../gorm/tests/detachedcriteria/DetachedCriteriaCountSpec.groovy      | 2 +-
 .../gorm/tests/detachedcriteria/DetachedCriteriaJoinSpec.groovy       | 2 +-
 .../tests/detachedcriteria/DetachedCriteriaProjectionAliasSpec.groovy | 2 +-
 .../gorm/tests/detachedcriteria/DetachedCriteriaProjectionSpec.groovy | 2 +-
 .../gorm/tests/dirtychecking/DirtyCheckingSpecHibernate7.groovy       | 2 +-
 .../grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy | 2 +-
 .../test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy   | 2 +-
 .../grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy     | 2 +-
 .../gorm/tests/hibernatequery/HibernateAssociationQuerySpec.groovy    | 2 +-
 .../groovy/grails/gorm/tests/hibernatequery/HibernateQuerySpec.groovy | 2 +-
 .../gorm/tests/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy      | 2 +-
 .../gorm/tests/hibernatequery/JpaProjectionTranslatorSpec.groovy      | 2 +-
 .../grails/gorm/tests/hibernatequery/JpaQueryContextSpec.groovy       | 2 +-
 .../grails/gorm/tests/hibernatequery/PredicateGeneratorSpec.groovy    | 2 +-
 .../groovy/grails/gorm/tests/proxy/Hibernate7GroovyProxySpec.groovy   | 2 +-
 .../groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy     | 2 +-
 .../groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy   | 2 +-
 .../test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy  | 2 +-
 .../src/test/groovy/grails/orm/HibernateCriteriaBuilderSpec.groovy    | 2 +-
 .../grails/data/testing/tck/tests/PagedResultSpecHibernate.groovy     | 2 +-
 .../groovy/org/grails/datastore/gorm/GormEnhancerCleanupSpec.groovy   | 2 +-
 .../org/grails/orm/hibernate/GrailsHibernateTemplateSpec.groovy       | 2 +-
 .../org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy | 2 +-
 .../grails/orm/hibernate/HibernateDatastoreMultiTenancySpec.groovy    | 2 +-
 .../orm/hibernate/HibernateDatastoreSchemaMultiTenancySpec.groovy     | 2 +-
 .../org/grails/orm/hibernate/HibernateDetachedCriteriaSpec.groovy     | 2 +-
 .../groovy/org/grails/orm/hibernate/HibernateGormEnhancerSpec.groovy  | 2 +-
 .../org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy      | 2 +-
 .../groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy | 2 +-
 .../test/groovy/org/grails/orm/hibernate/HibernateSessionSpec.groovy  | 2 +-
 .../orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy      | 4 ++--
 .../org/grails/orm/hibernate/cfg/GrailsHibernateUtilSpec.groovy       | 2 +-
 .../orm/hibernate/cfg/HibernateMappingContextConfigurationSpec.groovy | 2 +-
 .../org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy   | 2 +-
 .../orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy       | 2 +-
 .../cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy   | 2 +-
 .../orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy   | 4 ++--
 .../hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy  | 2 +-
 .../orm/hibernate/cfg/domainbinding/IncrementGeneratorSpec.groovy     | 2 +-
 .../grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy  | 2 +-
 .../orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy     | 4 ++--
 .../hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy    | 2 +-
 .../binder/RootPersistentClassCommonValuesBinderSpec.groovy           | 2 +-
 .../domainbinding/generator/GrailsSequenceGeneratorEnumSpec.groovy    | 2 +-
 .../domainbinding/generator/GrailsSequenceStyleGeneratorSpec.groovy   | 4 ++--
 .../cfg/domainbinding/hibernate/HibernateBasicPropertySpec.groovy     | 2 +-
 .../hibernate/HibernateCompositeIdentityPropertySpec.groovy           | 2 +-
 .../domainbinding/hibernate/HibernateCustomEnumPropertySpec.groovy    | 2 +-
 .../cfg/domainbinding/hibernate/HibernateCustomPropertySpec.groovy    | 2 +-
 .../domainbinding/hibernate/HibernateManyToManyPropertySpec.groovy    | 2 +-
 .../cfg/domainbinding/hibernate/HibernateManyToOnePropertySpec.groovy | 2 +-
 .../cfg/domainbinding/hibernate/HibernateOneToManyPropertySpec.groovy | 2 +-
 .../cfg/domainbinding/hibernate/HibernatePersistentEntitySpec.groovy  | 2 +-
 .../domainbinding/hibernate/HibernatePersistentPropertySpec.groovy    | 4 ++--
 .../domainbinding/hibernate/HibernateSimpleEnumPropertySpec.groovy    | 2 +-
 .../hibernate/HibernateSimpleIdentityPropertySpec.groovy              | 2 +-
 .../cfg/domainbinding/hibernate/HibernateSimplePropertySpec.groovy    | 2 +-
 .../cfg/domainbinding/hibernate/HibernateToOnePropertySpec.groovy     | 2 +-
 .../cfg/domainbinding/hibernate/HibernateVersionPropertySpec.groovy   | 2 +-
 .../domainbinding/secondpass/BidirectionalMapElementBinderSpec.groovy | 4 ++--
 .../cfg/domainbinding/secondpass/CollectionKeyBinderSpec.groovy       | 4 ++--
 .../domainbinding/secondpass/CollectionKeyColumnUpdaterSpec.groovy    | 4 ++--
 .../secondpass/HibernateToManyEntityOrderByBinderSpec.groovy          | 4 ++--
 .../cfg/domainbinding/secondpass/ManyToOneElementBinderSpec.groovy    | 4 ++--
 .../cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy       | 4 ++--
 .../secondpass/ToManyEntityMultiTenantFilterBinderSpec.groovy         | 4 ++--
 .../domainbinding/secondpass/UnidirectionalOneToManyBinderSpec.groovy | 4 ++--
 .../hibernate/connections/HibernateConnectionSourceFactorySpec.groovy | 2 +-
 .../hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy    | 2 +-
 .../orm/hibernate/connections/PartitionedMultiTenancySpec.groovy      | 2 +-
 .../orm/hibernate/dirty/GrailsEntityDirtinessStrategySpec.groovy      | 2 +-
 .../grails/orm/hibernate/proxy/ByteBuddyGroovyInterceptorSpec.groovy  | 2 +-
 .../org/grails/orm/hibernate/proxy/HibernateProxyHandler7Spec.groovy  | 2 +-
 .../grails/orm/hibernate/query/HibernateHqlQueryCreatorSpec.groovy    | 2 +-
 .../org/grails/orm/hibernate/query/JpaProjectionAdapterSpec.groovy    | 2 +-
 .../groovy/org/grails/orm/hibernate/query/MutationHqlQuerySpec.groovy | 2 +-
 .../org/grails/orm/hibernate/query/MutationQueryDelegateSpec.groovy   | 2 +-
 .../groovy/org/grails/orm/hibernate/query/SelectHqlQuerySpec.groovy   | 2 +-
 .../org/grails/orm/hibernate/query/SelectQueryDelegateSpec.groovy     | 2 +-
 .../org/grails/orm/hibernate/support/ClosureEventListenerSpec.groovy  | 4 ++--
 .../hibernate/support/ClosureEventTriggeringInterceptorSpec.groovy    | 4 ++--
 .../org/grails/orm/hibernate/support/HibernateRuntimeUtilsSpec.groovy | 2 +-
 .../apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy   | 4 ----
 .../groovy/org/apache/grails/data/testing/tck/tests/RLikeSpec.groovy  | 2 +-
 .../grails/data/testing/tck/tests/SizeQuerySpecHibernate.groovy       | 2 +-
 .../grails/data/testing/tck/tests/ValidationHibernateSpec.groovy      | 4 ++--
 103 files changed, 119 insertions(+), 123 deletions(-)

diff --git a/.agents/skills/hibernate-developer/SKILL.md 
b/.agents/skills/hibernate-developer/SKILL.md
index 9292725275..37899f949f 100644
--- a/.agents/skills/hibernate-developer/SKILL.md
+++ b/.agents/skills/hibernate-developer/SKILL.md
@@ -88,7 +88,7 @@ Keep these module-specific expectations in mind:
 When touching `grails-data-hibernate7`, test through real Hibernate wiring 
rather than assuming mocks are enough.
 
 - Use `HibernateGormDatastoreSpec` for Hibernate 7 integration and 
domain-binding specifications.
-- Prefer `manager.addAllDomainClasses([...])` in `setupSpec()` to register 
entities for specs.
+- Prefer `manager.registerDomainClasses(...)` in `setupSpec()` to register 
entities for specs.
 - Define test entities as top-level classes in the same Groovy spec file.
 - Ensure test domain class names are globally unique within the package to 
avoid collisions during parallel execution.
 - Prefer real entities over heavy mocking for binder logic.
diff --git 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy
index 3782012330..274849dac2 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy
@@ -28,7 +28,7 @@ import static 
grails.gorm.hibernate.mapping.MappingBuilder.define
  */
 class CompositeIdWithJoinTableSpec extends HibernateGormDatastoreSpec {
     def setupSpec() {
-        manager.addAllDomainClasses([CompositeIdParent, CompositeIdChild])
+        manager.registerDomainClasses(CompositeIdParent, CompositeIdChild)
     }
 
     //    @Rollback
diff --git 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy
index d0c0751e02..08c6ef6e7c 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy
@@ -30,7 +30,7 @@ import spock.lang.Issue
 class CompositeIdWithManyToOneAndSequenceSpec extends 
HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Tooth, ToothDisease])
+        manager.registerDomainClasses(Tooth, ToothDisease)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy
index 78ce960187..33b1643b3f 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy
@@ -36,7 +36,7 @@ import java.sql.ResultSet
 class IdentityEnumTypeSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([EnumEntityDomain, FooWithEnum])
+        manager.registerDomainClasses(EnumEntityDomain, FooWithEnum)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy
index dbb53a51fc..fa0da2c2d0 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy
@@ -32,7 +32,7 @@ import spock.lang.Issue
 class UniqueWithinGroupSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Thing])
+        manager.registerDomainClasses(Thing)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler5Spec.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler5Spec.groovy
index ae220ad810..aa05365141 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler5Spec.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler5Spec.groovy
@@ -37,7 +37,7 @@ class HibernateProxyHandler5Spec extends  
GrailsDataTckSpec<GrailsDataHibernate5
     @Shared HibernateProxyHandler proxyHandler = new HibernateProxyHandler()
 
     void setupSpec() {
-        manager.addAllDomainClasses([Location, Person, Pet])
+        manager.registerDomainClasses(Location, Person, Pet)
     }
 
     void "test isInitialized for a non-proxied object"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/AddToManagedEntitySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/AddToManagedEntitySpec.groovy
index e41846e664..a02391b966 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/AddToManagedEntitySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/AddToManagedEntitySpec.groovy
@@ -32,7 +32,7 @@ import org.grails.datastore.gorm.GormEntity
 class AddToManagedEntitySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([CascadeAuthor, CascadeBook])
+        manager.registerDomainClasses(CascadeAuthor, CascadeBook)
     }
 
     void cleanup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy
index 765112812d..469b774a9c 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy
@@ -41,10 +41,10 @@ import java.beans.PropertyDescriptor
 class HibernateMappingFactorySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([MappingFactoryBook, MappingFactoryAuthor, 
MappingFactoryTag,
+        manager.registerDomainClasses(MappingFactoryBook, 
MappingFactoryAuthor, MappingFactoryTag,
                                      MappingFactoryArticle, 
MappingFactoryEnumBook,
                                      MappingFactoryPerson, 
MappingFactoryPassport,
-                                     MappingFactoryLibrary])
+                                     MappingFactoryLibrary)
     }
 
     // --- unit-style tests (standalone factory) ---
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernatePagedResultListSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernatePagedResultListSpec.groovy
index 85ad85b5b1..ee8501d11a 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernatePagedResultListSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/HibernatePagedResultListSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.Issue
 class HibernatePagedResultListSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HPBook])
+        manager.registerDomainClasses(HPBook)
     }
 
     void "test HibernatePagedResultList totalCount with HQL query"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy
index c33f671f6d..75201a0912 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.IgnoreIf
 class NullValueEqualSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([TestEntity])
+        manager.registerDomainClasses(TestEntity)
     }
 
     void "test null value in equal"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/PagedResultListSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/PagedResultListSpec.groovy
index e9c8fb0e5b..b539617ca0 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/PagedResultListSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/PagedResultListSpec.groovy
@@ -25,7 +25,7 @@ import org.grails.orm.hibernate.query.HibernatePagedResultList
 class PagedResultListSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([PRLBook])
+        manager.registerDomainClasses(PRLBook)
     }
 
     void "test PagedResultList totalCount with HQL query"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/RLikeHibernate7Spec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/RLikeHibernate7Spec.groovy
index 4e1aee91ee..88409b030a 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/RLikeHibernate7Spec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/RLikeHibernate7Spec.groovy
@@ -38,7 +38,7 @@ class RLikeHibernate7Spec extends HibernateGormDatastoreSpec {
     @Shared oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
 
     void setupSpec() {
-        manager.addAllDomainClasses([RlikeFoo])
+        manager.registerDomainClasses(RlikeFoo)
     }
 
     void "test rlike works with #db"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
index 18df300490..dd81fd2968 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
@@ -32,7 +32,7 @@ import spock.lang.Ignore
 class TablePerSubClassAndEmbeddedSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Company, Vendor])
+        manager.registerDomainClasses(Company, Vendor)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy
index 46d1c65398..9614958f71 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy
@@ -31,7 +31,7 @@ import spock.lang.*
 class UniqueWithMultipleDataSourcesSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Abc])
+        manager.registerDomainClasses(Abc)
         manager.grailsConfig = [
                 'dataSource': [
                         'url'        : 
"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
index 4b63d68d43..7b96e577c4 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
@@ -33,7 +33,7 @@ class CompositeIdWithDeepOneToManyMappingSpec extends 
HibernateGormDatastoreSpec
 
     @Override
     def setupSpec() {
-        manager.addAllDomainClasses([GrandParent, Parent, Child])
+        manager.registerDomainClasses(GrandParent, Parent, Child)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
index 1f6f76f24a..a0cfcbdf2a 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
@@ -34,7 +34,7 @@ import spock.lang.Issue
 class GlobalConstraintWithCompositeIdSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([ParentB, ChildB, DomainB])
+        manager.registerDomainClasses(ParentB, ChildB, DomainB)
         manager.grailsConfig = [
                 'dataSource.url'               : 
"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate'            : 'create-drop',
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachCriteriaSubquerySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachCriteriaSubquerySpec.groovy
index 3131406719..93ae3872f2 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachCriteriaSubquerySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachCriteriaSubquerySpec.groovy
@@ -28,7 +28,7 @@ import spock.lang.Ignore
 class DetachCriteriaSubquerySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([User, Group, GroupAssignment, 
Organisation])
+        manager.registerDomainClasses(User, Group, GroupAssignment, 
Organisation)
     }
 
     void "test detached associated criteria in subquery"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaCountSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaCountSpec.groovy
index 3687f3a1ac..b0ed3ed51b 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaCountSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaCountSpec.groovy
@@ -28,7 +28,7 @@ import spock.lang.Issue
 class DetachedCriteriaCountSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([CountItem])
+        manager.registerDomainClasses(CountItem)
     }
 
     private void createTestData() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaJoinSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaJoinSpec.groovy
index 6983a680e6..20fcd0bee7 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaJoinSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaJoinSpec.groovy
@@ -30,7 +30,7 @@ import org.hibernate.Hibernate
 class DetachedCriteriaJoinSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Team, Club])
+        manager.registerDomainClasses(Team, Club)
     }
 
     def "check if count works as expected"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionAliasSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionAliasSpec.groovy
index 6d1b41cc21..af60041c8d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionAliasSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionAliasSpec.groovy
@@ -40,7 +40,7 @@ class DetachedCriteriaProjectionAliasSpec extends 
HibernateGormDatastoreSpec {
     }
 
     def setupSpec() {
-        manager.addAllDomainClasses([Entity1, Entity2, DetachedEntity])
+        manager.registerDomainClasses(Entity1, Entity2, DetachedEntity)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionSpec.groovy
index 13d610ffd6..019164b9eb 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/detachedcriteria/DetachedCriteriaProjectionSpec.groovy
@@ -42,7 +42,7 @@ class DetachedCriteriaProjectionSpec extends 
HibernateGormDatastoreSpec {
     }
 
     def setupSpec() {
-        manager.addAllDomainClasses([Entity1, Entity2, DetachedEntity])
+        manager.registerDomainClasses(Entity1, Entity2, DetachedEntity)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/DirtyCheckingSpecHibernate7.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/DirtyCheckingSpecHibernate7.groovy
index 585a4946ef..ce647e6b42 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/DirtyCheckingSpecHibernate7.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/DirtyCheckingSpecHibernate7.groovy
@@ -23,7 +23,7 @@ import grails.gorm.tests.HibernateGormDatastoreSpec
 class DirtyCheckingSpecHibernate7 extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([DirtyCheckingTestBookHibernate7])
+        manager.registerDomainClasses(DirtyCheckingTestBookHibernate7)
     }
 
     void "When marking whole class dirty, then derived and transient 
properties are still not dirty"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy
index 8b5de3bed6..844cd01dc8 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy
@@ -30,7 +30,7 @@ import spock.lang.Issue
 class HibernateDirtyCheckingSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Person])
+        manager.registerDomainClasses(Person)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy
index e2a8a786c0..e5c440094b 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy
@@ -26,7 +26,7 @@ import org.grails.datastore.mapping.proxy.ProxyHandler
 class ListCollectionSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Animal, Leg])
+        manager.registerDomainClasses(Animal, Leg)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy
index 87d9ddbd20..63226d7d69 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy
@@ -36,7 +36,7 @@ import spock.lang.PendingFeature
 class TwoUnidirectionalHasManySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([EcmMask, EcmUser, EcmMaskJpa, JpaUser])
+        manager.registerDomainClasses(EcmMask, EcmUser, EcmMaskJpa, JpaUser)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateAssociationQuerySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateAssociationQuerySpec.groovy
index 4b8a55fdbc..9eb9bb6e2d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateAssociationQuerySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateAssociationQuerySpec.groovy
@@ -34,7 +34,7 @@ class HibernateAssociationQuerySpec extends 
HibernateGormDatastoreSpec {
     Person bob
 
     def setupSpec() {
-        manager.addAllDomainClasses([Person, Pet])
+        manager.registerDomainClasses(Person, Pet)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateQuerySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateQuerySpec.groovy
index ba51254ec8..625f76aa3b 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateQuerySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/HibernateQuerySpec.groovy
@@ -46,7 +46,7 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
     }
 
     def setupSpec() {
-        manager.addAllDomainClasses([Person, Pet, Face, EagerOwner, 
CommonTypes, HibernateQuerySpecBigDecimalEntity])
+        manager.registerDomainClasses(Person, Pet, Face, EagerOwner, 
CommonTypes, HibernateQuerySpecBigDecimalEntity)
     }
 
     def equals() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
index 310c58fd74..d77fcfc189 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
@@ -34,7 +34,7 @@ class JpaCriteriaQueryCreatorSpec extends 
HibernateGormDatastoreSpec {
 
 
     void setupSpec() {
-        manager.addAllDomainClasses([JpaCriteriaQueryCreatorSpecPerson, 
JpaCriteriaQueryCreatorSpecPet])
+        manager.registerDomainClasses(JpaCriteriaQueryCreatorSpecPerson, 
JpaCriteriaQueryCreatorSpecPet)
     }
 
     def "test createQuery"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaProjectionTranslatorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaProjectionTranslatorSpec.groovy
index 453bf0d51e..8e600e9b4a 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaProjectionTranslatorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaProjectionTranslatorSpec.groovy
@@ -31,7 +31,7 @@ import org.grails.datastore.gorm.GormEntity
 class JpaProjectionTranslatorSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([JpaProjectionTranslatorSpecPerson])
+        manager.registerDomainClasses(JpaProjectionTranslatorSpecPerson)
     }
 
     def "translate PropertyProjection"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaQueryContextSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaQueryContextSpec.groovy
index 743abe8c60..148982615b 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaQueryContextSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/JpaQueryContextSpec.groovy
@@ -31,7 +31,7 @@ import org.hibernate.query.criteria.JpaExpression
 class JpaQueryContextSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([JpaQueryContextSpecPerson])
+        manager.registerDomainClasses(JpaQueryContextSpecPerson)
     }
 
     def "getRoot returns the assigned root"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/PredicateGeneratorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/PredicateGeneratorSpec.groovy
index 2c7307179f..878fcefa53 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/PredicateGeneratorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/hibernatequery/PredicateGeneratorSpec.groovy
@@ -46,7 +46,7 @@ class PredicateGeneratorSpec extends 
HibernateGormDatastoreSpec {
     GrailsHibernatePersistentEntity personEntity
 
     void setupSpec() {
-        manager.addAllDomainClasses([PredicateGeneratorSpecPerson, 
PredicateGeneratorSpecPet, PredicateGeneratorSpecFace, 
PredicateGeneratorSpecNullableAgeEntity])
+        manager.registerDomainClasses(PredicateGeneratorSpecPerson, 
PredicateGeneratorSpecPet, PredicateGeneratorSpecFace, 
PredicateGeneratorSpecNullableAgeEntity)
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/proxy/Hibernate7GroovyProxySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/proxy/Hibernate7GroovyProxySpec.groovy
index b5af843546..9c6c2d65dd 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/proxy/Hibernate7GroovyProxySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/proxy/Hibernate7GroovyProxySpec.groovy
@@ -30,7 +30,7 @@ import org.grails.datastore.gorm.proxy.GroovyProxyFactory
 class Hibernate7GroovyProxySpec extends 
GrailsDataTckSpec<GrailsDataHibernate7TckManager> {
 
     void setupSpec() {
-        manager.addAllDomainClasses([Location])
+        manager.registerDomainClasses(Location)
     }
     void "Test creation and behavior of Groovy proxies"() {
         given:
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy
index fba2abf9a2..20ed1637c9 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy
@@ -31,7 +31,7 @@ import jakarta.validation.constraints.NotBlank
 class BeanValidationSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Bean])
+        manager.registerDomainClasses(Bean)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy
index 8d18a59c5e..09949ca0df 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy
@@ -31,7 +31,7 @@ import spock.lang.Issue
 class UniqueWithHasOneSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Foo, Bar])
+        manager.registerDomainClasses(Foo, Bar)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
index 7fea5766f6..db8e1b6078 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
@@ -28,7 +28,7 @@ import org.grails.orm.hibernate.HibernateDatastore
 class HibernateCriteriaBuilderDirectSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([CriteriaTestEntity, CriteriaTestChild])
+        manager.registerDomainClasses(CriteriaTestEntity, CriteriaTestChild)
     }
 
     HibernateCriteriaBuilder c
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderSpec.groovy
index cfc6fc2f38..878a40f9ac 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderSpec.groovy
@@ -46,7 +46,7 @@ import 
org.grails.datastore.mapping.query.api.BuildableCriteria
 class HibernateCriteriaBuilderSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([CriteriaAccount, CriteriaTransaction])
+        manager.registerDomainClasses(CriteriaAccount, CriteriaTransaction)
     }
 
     BuildableCriteria c
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpecHibernate.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpecHibernate.groovy
index 0fc37dc744..2cb6c18078 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpecHibernate.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpecHibernate.groovy
@@ -24,7 +24,7 @@ import org.apache.grails.data.testing.tck.domains.Person
 class PagedResultSpecHibernate extends GrailsDataTckSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([Person])
+        manager.registerDomainClasses(Person)
     }
 
     void "Test that a getTotalCount will return 0 on empty result from the 
list() method"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/datastore/gorm/GormEnhancerCleanupSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/datastore/gorm/GormEnhancerCleanupSpec.groovy
index 8559590d65..6874a037e6 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/datastore/gorm/GormEnhancerCleanupSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/datastore/gorm/GormEnhancerCleanupSpec.groovy
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap
 class GormEnhancerCleanupSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([CleanupEntity])
+        manager.registerDomainClasses(CleanupEntity)
     }
 
     void "Test that GormEnhancer.close() removes datastore from DATASTORES 
registry"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/GrailsHibernateTemplateSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/GrailsHibernateTemplateSpec.groovy
index 4b349e020b..cd625bc45e 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/GrailsHibernateTemplateSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/GrailsHibernateTemplateSpec.groovy
@@ -35,7 +35,7 @@ class GrailsHibernateTemplateSpec extends 
HibernateGormDatastoreSpec {
 
     @Override
     void setupSpec() {
-        manager.addAllDomainClasses([TemplateBook])
+        manager.registerDomainClasses(TemplateBook)
     }
 
     void setup() {
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 9f492696e6..da743dc278 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
@@ -61,7 +61,7 @@ class HibernateDatastoreIntegrationSpec extends 
HibernateGormDatastoreSpec {
             'grails.hibernate.cache.queries' : false,
             'grails.hibernate.osiv.readonly' : false,
         ]
-        manager.addAllDomainClasses([DatastoreBook])
+        manager.registerDomainClasses(DatastoreBook)
         println "================================================"
     }
 
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreMultiTenancySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreMultiTenancySpec.groovy
index d18c05672d..0b7765c010 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreMultiTenancySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreMultiTenancySpec.groovy
@@ -41,7 +41,7 @@ class HibernateDatastoreMultiTenancySpec extends 
HibernateGormDatastoreSpec {
                 'grails.gorm.multiTenancy.mode': 
MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
                 'grails.gorm.multiTenancy.tenantResolver': new 
SystemPropertyTenantResolver()
         ]
-        manager.addAllDomainClasses([MultiTenantBook])
+        manager.registerDomainClasses(MultiTenantBook)
     }
 
     void "test discriminator multi-tenancy filter"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSchemaMultiTenancySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSchemaMultiTenancySpec.groovy
index 02b91d82d2..ddad86cf44 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSchemaMultiTenancySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSchemaMultiTenancySpec.groovy
@@ -38,7 +38,7 @@ class HibernateDatastoreSchemaMultiTenancySpec extends 
HibernateGormDatastoreSpe
                 'grails.gorm.multiTenancy.mode': 
MultiTenancySettings.MultiTenancyMode.SCHEMA,
                 'grails.gorm.multiTenancy.tenantResolver': new 
SystemPropertyTenantResolver()
         ]
-        manager.addAllDomainClasses([SchemaBook])
+        manager.registerDomainClasses(SchemaBook)
     }
 
     void "test schema multi-tenancy"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDetachedCriteriaSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDetachedCriteriaSpec.groovy
index b336529e56..e27bb4fd49 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDetachedCriteriaSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDetachedCriteriaSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.Unroll
 class HibernateDetachedCriteriaSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HDCProduct])
+        manager.registerDomainClasses(HDCProduct)
     }
 
     @Unroll
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormEnhancerSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormEnhancerSpec.groovy
index 90285d8b17..cc7f463c0d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormEnhancerSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormEnhancerSpec.groovy
@@ -26,7 +26,7 @@ import 
org.grails.datastore.mapping.core.connections.ConnectionSource
 class HibernateGormEnhancerSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HGESimple])
+        manager.registerDomainClasses(HGESimple)
     }
 
     def "test findStaticApi"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy
index 6cf7630831..069fb86372 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy
@@ -29,7 +29,7 @@ import org.grails.orm.hibernate.query.SelectHqlQuery
 class HibernateGormInstanceApiSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([PersonInstanceApi, BookInstanceApi, 
ConstrainedPerson, ConstrainedBook, HGIAuthor, HGIBook])
+        manager.registerDomainClasses(PersonInstanceApi, BookInstanceApi, 
ConstrainedPerson, ConstrainedBook, HGIAuthor, HGIBook)
     }
 
     void "Test that HibernateGormInstanceApi uses the shared template from the 
datastore"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
index 8b1bd314c4..eef1d0ad37 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
@@ -27,7 +27,7 @@ import grails.gorm.tests.entities.Club
 class HibernateGormStaticApiSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HibernateGormStaticApiEntity, Club, 
HibernateGormStaticApiMultiTenantEntity])
+        manager.registerDomainClasses(HibernateGormStaticApiEntity, Club, 
HibernateGormStaticApiMultiTenantEntity)
     }
 
     void "Test that HibernateGormStaticApi uses the shared template from the 
datastore"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateSessionSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateSessionSpec.groovy
index 8f3ab43706..9f696c5d30 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateSessionSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateSessionSpec.groovy
@@ -28,7 +28,7 @@ import org.grails.orm.hibernate.query.HibernateQuery
 class HibernateSessionSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HSBook])
+        manager.registerDomainClasses(HSBook)
     }
 
     // 
-------------------------------------------------------------------------
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
index 32b9a709de..35aab61a55 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
@@ -32,7 +32,7 @@ import org.hibernate.MappingException
 class GrailsHibernatePersistentEntitySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
                 Simple,
                 CustomDiscriminator,
                 NumericDiscriminator,
@@ -44,7 +44,7 @@ class GrailsHibernatePersistentEntitySpec extends 
HibernateGormDatastoreSpec {
                 CustomTableEntity,
                 CustomTableNameEntity,
                 DerivedPropertyEntity
-        ])
+        )
     }
 
     void "test getTableName"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtilSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtilSpec.groovy
index a30e4934d3..3892689553 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtilSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtilSpec.groovy
@@ -32,7 +32,7 @@ class GrailsHibernateUtilSpec extends 
HibernateGormDatastoreSpec {
     HibernateProxyHandler proxyHandlerMock = Mock(HibernateProxyHandler)
 
     void setupSpec() {
-        manager.addAllDomainClasses([GHUBook, GHUAuthor, GHUAnnotatedEntity])
+        manager.registerDomainClasses(GHUBook, GHUAuthor, GHUAnnotatedEntity)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfigurationSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfigurationSpec.groovy
index bbe2fb3af1..c4463db284 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfigurationSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfigurationSpec.groovy
@@ -451,7 +451,7 @@ class HibernateMappingContextConfigurationSpec extends 
Specification {
 class HibernateMappingContextConfigurationIntegrationSpec extends 
HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HmccTestBook, HmccTestAuthor])
+        manager.registerDomainClasses(HmccTestBook, HmccTestAuthor)
     }
 
     def "buildSessionFactory produces a working session factory via 
HibernateDatastore"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy
index c395a5e97b..5686060f29 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy
@@ -36,7 +36,7 @@ import 
org.grails.datastore.mapping.core.connections.ConnectionSource
 class HibernateMappingContextSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([MappingContextBook, MappingContextAuthor, 
MappingContextAddress])
+        manager.registerDomainClasses(MappingContextBook, 
MappingContextAuthor, MappingContextAddress)
     }
 
     // --- unit-style tests (no datastore required) ---
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
index fca4f06396..b9a7cc7354 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
@@ -78,7 +78,7 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec 
{
     }
 
     def setupSpec() {
-        manager.addAllDomainClasses([Person, Pet, CBManyToManyA, 
CBManyToManyB])
+        manager.registerDomainClasses(Person, Pet, CBManyToManyA, 
CBManyToManyB)
     }
 
     void "test bindCollection delegates configuration to 
property.setCollection"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
index 575af4b8af..0598c88c45 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
@@ -31,7 +31,7 @@ class ConfigureDerivedPropertiesConsumerSpec extends 
HibernateGormDatastoreSpec
     HibernatePersistentProperty titleProperty
 
     def setupSpec() {
-        manager.addAllDomainClasses([CDPCBook])
+        manager.registerDomainClasses(CDPCBook)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
index 139533c410..3c553f70cb 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
@@ -113,7 +113,7 @@ class GrailsPropertyBinderSpec extends 
HibernateGormDatastoreSpec {
     }
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             PropertyBinderSpecSimpleBook,
             PropertyBinderSpecEnumBook,
             PropertyBinderSpecAuthor,
@@ -127,7 +127,7 @@ class GrailsPropertyBinderSpec extends 
HibernateGormDatastoreSpec {
             PropertyBinderSpecFKOwner,
             PropertyBinderSpecFKChild,
             PropertyBinderSpecTenantEntity
-        ])
+        )
     }
 
     void "Test bind simple property"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
index bc94310f1c..b19887dd65 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
@@ -28,7 +28,7 @@ import org.hibernate.type.ForeignKeyDirection
 class HibernateOneToOnePropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([OneToOneFace, OneToOneNose, OneToOneLeft, 
OneToOneRight])
+        manager.registerDomainClasses(OneToOneFace, OneToOneNose, 
OneToOneLeft, OneToOneRight)
     }
 
     void "getHibernateInverseSide returns HibernateOneToOneProperty"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IncrementGeneratorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IncrementGeneratorSpec.groovy
index 08dc866554..384b1f8542 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IncrementGeneratorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IncrementGeneratorSpec.groovy
@@ -35,7 +35,7 @@ import org.hibernate.mapping.Property
 class IncrementGeneratorSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([EntityWithIncrement])
+        manager.registerDomainClasses(EntityWithIncrement)
     }
 
     @Rollback
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
index a9c57363bc..2ecc69c120 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
@@ -37,7 +37,7 @@ class PropertyBinderSpec extends HibernateGormDatastoreSpec {
     @Shared PropertyBinder binder = new PropertyBinder(new 
CascadeBehaviorFetcher())
 
     void setupSpec() {
-        manager.addAllDomainClasses([PBEntity, PBAuthor])
+        manager.registerDomainClasses(PBEntity, PBAuthor)
     }
 
     void "test property binding with real objects"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy
index 8f8d1d7b20..b345e6ce36 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy
@@ -27,12 +27,12 @@ import spock.lang.Unroll
 class SequenceGeneratorsSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([EntityWithIdentity,
+        manager.registerDomainClasses(EntityWithIdentity,
                                      EntityWithNative,
                                      EntityWithSequence,
                                      EntityWithTable,
                                      EntityWithUUID,
-                                     EntityWithAssigned])
+                                     EntityWithAssigned)
     }
 
 
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
index ced3e963e1..a76234cf08 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
@@ -40,7 +40,7 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec 
{
     ComponentUpdater updater
 
     def setupSpec() {
-        manager.addAllDomainClasses([CUPerson, CUAddress])
+        manager.registerDomainClasses(CUPerson, CUAddress)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy
index edd396eb1d..cdf3cfbb3e 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy
@@ -41,7 +41,7 @@ class RootPersistentClassCommonValuesBinderSpec extends 
HibernateGormDatastoreSp
     GrailsDomainBinder gormDomainBinder
 
     void setup() {
-        manager.addAllDomainClasses([TestEntity, AbstractTestEntity, 
CachedEntity, ReadOnlyCachedEntity, NonLazyCachedEntity])
+        manager.registerDomainClasses(TestEntity, AbstractTestEntity, 
CachedEntity, ReadOnlyCachedEntity, NonLazyCachedEntity)
         
         gormDomainBinder = getGrailsDomainBinder()
         metadataBuildingContext = gormDomainBinder.getMetadataBuildingContext()
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnumSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnumSpec.groovy
index dc38e9887f..1fe78e8a0c 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnumSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnumSpec.groovy
@@ -58,7 +58,7 @@ class GrailsSequenceGeneratorEnumSpec extends 
HibernateGormDatastoreSpec {
             'hibernate.dialect'           : 
'org.hibernate.dialect.PostgreSQLDialect',
             'hibernate.hbm2ddl.auto'      : 'create',
         ]
-        manager.addAllDomainClasses([GrailsSequenceGeneratorEnumSpecEntity])
+        manager.registerDomainClasses(GrailsSequenceGeneratorEnumSpecEntity)
     }
 
     /**
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGeneratorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGeneratorSpec.groovy
index 6eb52fe106..03751d824b 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGeneratorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGeneratorSpec.groovy
@@ -64,9 +64,9 @@ class GrailsSequenceStyleGeneratorSpec extends 
HibernateGormDatastoreSpec {
     }
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             SequenceStyleGeneratorSpecEntity
-        ])
+        )
     }
 
     def "test constructor logic with default parameters"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateBasicPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateBasicPropertySpec.groovy
index ec035c9786..d9b1f7fae9 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateBasicPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateBasicPropertySpec.groovy
@@ -31,7 +31,7 @@ import java.lang.annotation.RetentionPolicy
 class HibernateBasicPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HBPPerson])
+        manager.registerDomainClasses(HBPPerson)
     }
 
     def "test getCollection throws exception if not initialized"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCompositeIdentityPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCompositeIdentityPropertySpec.groovy
index e432df43a2..4731a9c22a 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCompositeIdentityPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCompositeIdentityPropertySpec.groovy
@@ -24,7 +24,7 @@ import grails.persistence.Entity
 class HibernateCompositeIdentityPropertySpec extends 
HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HCIPSimpleEntity, HCIPCompositeEntity])
+        manager.registerDomainClasses(HCIPSimpleEntity, HCIPCompositeEntity)
     }
 
     def "two-arg constructor creates property with empty parts array"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomEnumPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomEnumPropertySpec.groovy
index 30bacda2e8..e2eb74b6ff 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomEnumPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomEnumPropertySpec.groovy
@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy
 class HibernateCustomEnumPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HCEPEntity])
+        manager.registerDomainClasses(HCEPEntity)
     }
 
     def "HibernateCustomEnumProperty instantiation and behavior"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomPropertySpec.groovy
index 523f1a52b3..e0ea338b16 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomPropertySpec.groovy
@@ -26,7 +26,7 @@ import 
org.grails.datastore.mapping.engine.types.CustomTypeMarshaller
 class HibernateCustomPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HCPTestEntity])
+        manager.registerDomainClasses(HCPTestEntity)
     }
 
     def "HibernateCustomProperty instantiation and behavior"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyPropertySpec.groovy
index 33df391759..6323a8c0a7 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyPropertySpec.groovy
@@ -24,7 +24,7 @@ import grails.persistence.Entity
 class HibernateManyToManyPropertySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HMMPA, HMMPB])
+        manager.registerDomainClasses(HMMPA, HMMPB)
     }
 
     def "test HibernateManyToManyProperty basic methods"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToOnePropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToOnePropertySpec.groovy
index bdfb4770a0..52e98cecfa 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToOnePropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToOnePropertySpec.groovy
@@ -25,7 +25,7 @@ import 
org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOnePr
 class HibernateManyToOnePropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HMTOPBook, HMTOPAuthor])
+        manager.registerDomainClasses(HMTOPBook, HMTOPAuthor)
     }
 
     void "test getReferencedEntityName returns the correct entity name"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToManyPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToManyPropertySpec.groovy
index 04b4cdd2f0..573fbecd4f 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToManyPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToManyPropertySpec.groovy
@@ -29,7 +29,7 @@ import java.beans.PropertyDescriptor
 class HibernateOneToManyPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HOTMPBook, HOTMPAuthor])
+        manager.registerDomainClasses(HOTMPBook, HOTMPAuthor)
     }
 
     void "test getReferencedEntityName returns the correct entity name"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntitySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntitySpec.groovy
index 9136609a9d..b45668a0ea 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntitySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntitySpec.groovy
@@ -28,7 +28,7 @@ import org.hibernate.mapping.RootClass
 class HibernatePersistentEntitySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HPESimple, HPEComposite])
+        manager.registerDomainClasses(HPESimple, HPEComposite)
     }
 
     def "getIdentity returns null if identity is not 
HibernatePersistentProperty"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentPropertySpec.groovy
index df21bf770a..358d945635 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentPropertySpec.groovy
@@ -26,11 +26,11 @@ import spock.lang.Shared
 class HibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             LazyBook, LazyAuthor, ExplicitNonLazy, JoinFetchEntity, EnumEntity,
             GeneratorDefaultEntity, GeneratorUuid2Entity, CompositeKeyEntity,
             HPPSManyA, HPPSManyB, HPPSClassTyped, HPPSStringTyped
-        ])
+        )
     }
 
     def "test isLazy for standard property"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleEnumPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleEnumPropertySpec.groovy
index 4d1fe3b8aa..756410942c 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleEnumPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleEnumPropertySpec.groovy
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy
 class HibernateSimpleEnumPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HSEPEntity])
+        manager.registerDomainClasses(HSEPEntity)
     }
 
     def "HibernateSimpleEnumProperty instantiation and behavior"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleIdentityPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleIdentityPropertySpec.groovy
index 88f244d395..eba01eafbb 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleIdentityPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleIdentityPropertySpec.groovy
@@ -24,7 +24,7 @@ import grails.gorm.tests.HibernateGormDatastoreSpec
 class HibernateSimpleIdentityPropertySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HSIPSimpleEntity, HSIPAssignedEntity])
+        manager.registerDomainClasses(HSIPSimpleEntity, HSIPAssignedEntity)
     }
 
     def "name-and-type constructor creates property with given name and 
type"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimplePropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimplePropertySpec.groovy
index 799e202e13..03279d6918 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimplePropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimplePropertySpec.groovy
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy
 class HibernateSimplePropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HSPEntity])
+        manager.registerDomainClasses(HSPEntity)
     }
 
     def "HibernateSimpleProperty instantiation and basic behavior"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToOnePropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToOnePropertySpec.groovy
index 8f4583b6d2..99591c4ba9 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToOnePropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToOnePropertySpec.groovy
@@ -28,7 +28,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig
 class HibernateToOnePropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HTOPAuthor, HTOPBook, HTOPProfile, 
HTOPAddress])
+        manager.registerDomainClasses(HTOPAuthor, HTOPBook, HTOPProfile, 
HTOPAddress)
     }
 
     // ─── HibernateManyToOneProperty Tests 
────────────────────────────────────
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateVersionPropertySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateVersionPropertySpec.groovy
index 0eda003366..75699a7acf 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateVersionPropertySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateVersionPropertySpec.groovy
@@ -25,7 +25,7 @@ import java.beans.PropertyDescriptor
 class HibernateVersionPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HVPEntity])
+        manager.registerDomainClasses(HVPEntity)
     }
 
     def "HibernateVersionProperty instantiation and behavior"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalMapElementBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalMapElementBinderSpec.groovy
index cd0a70a4cf..4b3c9927b2 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalMapElementBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalMapElementBinderSpec.groovy
@@ -38,10 +38,10 @@ class BidirectionalMapElementBinderSpec extends 
HibernateGormDatastoreSpec {
     BidirectionalMapElementBinder binder
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             BBMEOwner,
             BBMEItem,
-        ])
+        )
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyBinderSpec.groovy
index eb5a22291c..902da54354 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyBinderSpec.groovy
@@ -41,7 +41,7 @@ class CollectionKeyBinderSpec extends 
HibernateGormDatastoreSpec {
     CollectionKeyBinder binder
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             CKBBidOwner,
             CKBBidItem,
             CKBManyToManyOwner,
@@ -52,7 +52,7 @@ class CollectionKeyBinderSpec extends 
HibernateGormDatastoreSpec {
             CKBJoinKeyItem,
             CKBCompositeOwner,
             CKBCompositeItem
-        ])
+        )
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdaterSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdaterSpec.groovy
index e902ceeaaa..8b40ff08eb 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdaterSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdaterSpec.groovy
@@ -34,13 +34,13 @@ class CollectionKeyColumnUpdaterSpec extends 
HibernateGormDatastoreSpec {
     CollectionKeyBinder collectionKeyBinder = Mock(CollectionKeyBinder)
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             CKCUOwnerOne,
             CKCUItemOne,
             CKCUOwnerMany,
             CKCUItemMany1,
             CKCUItemMany2
-        ])
+        )
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/HibernateToManyEntityOrderByBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/HibernateToManyEntityOrderByBinderSpec.groovy
index de5d9bbf7f..9727dec1f9 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/HibernateToManyEntityOrderByBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/HibernateToManyEntityOrderByBinderSpec.groovy
@@ -39,14 +39,14 @@ class HibernateToManyEntityOrderByBinderSpec extends 
HibernateGormDatastoreSpec
 
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             COBOwnerEntity,
             COBAssociatedItem,
             COBUnidirectionalOwner,
             COBBaseItem,
             COBSubItem,
             COBHierarchyOwner,
-        ])
+        )
     }
 
     private HibernateToManyEntityProperty propertyFor(Class ownerClass, String 
name = "items") {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ManyToOneElementBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ManyToOneElementBinderSpec.groovy
index 0438e186b5..6bc267ca95 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ManyToOneElementBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ManyToOneElementBinderSpec.groovy
@@ -38,12 +38,12 @@ class ManyToOneElementBinderSpec extends 
HibernateGormDatastoreSpec {
     ManyToOneElementBinder binder
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             MTMEOwner,
             MTMEItem,
             MTMEBase,
             MTMESubtype,
-        ])
+        )
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
index 89268e0721..c9e75bbc8f 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
@@ -173,14 +173,14 @@ class MapSecondPassBinderSpec extends 
HibernateGormDatastoreSpec {
     }
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             org.apache.grails.data.testing.tck.domains.Pet,
             org.apache.grails.data.testing.tck.domains.Person,
             org.apache.grails.data.testing.tck.domains.PetType,
             MapSPBAuthor,
             MapSPBBook,
             MapSPBOwner
-        ])
+        )
     }
 
     void "Test bind map"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ToManyEntityMultiTenantFilterBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ToManyEntityMultiTenantFilterBinderSpec.groovy
index 1060b6d8dc..9a5fc4254e 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ToManyEntityMultiTenantFilterBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ToManyEntityMultiTenantFilterBinderSpec.groovy
@@ -38,7 +38,7 @@ class ToManyEntityMultiTenantFilterBinderSpec extends 
HibernateGormDatastoreSpec
     ToManyEntityMultiTenantFilterBinder binder
 
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             CMTBBidirectionalOwner,
             CMTBBidirectionalItem,
             CMTBUnidirectionalOwner,
@@ -47,7 +47,7 @@ class ToManyEntityMultiTenantFilterBinderSpec extends 
HibernateGormDatastoreSpec
             CMTBNonTenantItem,
             CMTBManyToManyOwner,
             CMTBManyToManyItem,
-        ])
+        )
         manager.grailsConfig = [
             "grails.gorm.multiTenancy.mode"               : 
MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
             "grails.gorm.multiTenancy.tenantResolverClass": 
SystemPropertyTenantResolver,
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinderSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinderSpec.groovy
index 3855f7f85e..3b4e09dff5 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinderSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinderSpec.groovy
@@ -44,9 +44,9 @@ class UnidirectionalOneToManyBinderSpec extends 
HibernateGormDatastoreSpec {
     UnidirectionalOneToManyBinder binder
 
     def setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
                 UniOwner, UniPet
-        ])
+        )
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy
index 73c40eb7ec..3355919fa3 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy
@@ -42,7 +42,7 @@ import org.springframework.context.support.StaticMessageSource
 class HibernateConnectionSourceFactorySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([Foo])
+        manager.registerDomainClasses(Foo)
     }
 
     private static Map<String, String> h2Config() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
index a70c20fe8b..6a42d6ba08 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
@@ -30,7 +30,7 @@ import spock.lang.Issue
 class MultipleDataSourcesWithEventsSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([EventsBook, SecondaryBook])
+        manager.registerDomainClasses(EventsBook, SecondaryBook)
         manager.grailsConfig = [
                 'dataSource': [
                         'url'        : 
"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
index 77ab467d03..1668b5b425 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
@@ -56,7 +56,7 @@ import org.hibernate.dialect.H2Dialect
 class PartitionedMultiTenancySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([MultiTenantAuthor, MultiTenantBook, 
MultiTenantPublisher])
+        manager.registerDomainClasses(MultiTenantAuthor, MultiTenantBook, 
MultiTenantPublisher)
         manager.grailsConfig = [
                 'dataSource.url'                              : 
"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate'                         : 'update',
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategySpec.groovy
index b149dcc2ee..72ad61939d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategySpec.groovy
@@ -30,7 +30,7 @@ import org.hibernate.persister.entity.EntityPersister
 class GrailsEntityDirtinessStrategySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([DSBook, DSEmbeddedEntity])
+        manager.registerDomainClasses(DSBook, DSEmbeddedEntity)
     }
 
     def "canDirtyCheck returns true for DirtyCheckable"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/ByteBuddyGroovyInterceptorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/ByteBuddyGroovyInterceptorSpec.groovy
index 5a92aedbc3..ae0fd97426 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/ByteBuddyGroovyInterceptorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/ByteBuddyGroovyInterceptorSpec.groovy
@@ -35,7 +35,7 @@ import org.hibernate.proxy.HibernateProxy
 class ByteBuddyGroovyInterceptorSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([Location])
+        manager.registerDomainClasses(Location)
     }
 
     private Long savedId
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler7Spec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler7Spec.groovy
index f1d776c12f..3f3e1a0a6d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler7Spec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler7Spec.groovy
@@ -39,7 +39,7 @@ class HibernateProxyHandler7Spec extends 
HibernateGormDatastoreSpec {
     @Shared HibernateProxyHandler proxyHandler = new HibernateProxyHandler()
 
     void setupSpec() {
-        manager.addAllDomainClasses([Location, Person, Pet])
+        manager.registerDomainClasses(Location, Person, Pet)
     }
 
     void "test isInitialized for native Hibernate proxy"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQueryCreatorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQueryCreatorSpec.groovy
index ad0e1c5a65..2ac465e852 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQueryCreatorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQueryCreatorSpec.groovy
@@ -25,7 +25,7 @@ import org.grails.datastore.mapping.query.Query
 class HibernateHqlQueryCreatorSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([HqlCreatorSpecBook])
+        manager.registerDomainClasses(HqlCreatorSpecBook)
     }
 
     void "createHqlQuery returns SelectHqlQuery for SELECT"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/JpaProjectionAdapterSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/JpaProjectionAdapterSpec.groovy
index 0af4cc8aad..4a68574a62 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/JpaProjectionAdapterSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/JpaProjectionAdapterSpec.groovy
@@ -31,7 +31,7 @@ import 
org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersi
 class JpaProjectionAdapterSpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([AdapterTestEntity])
+        manager.registerDomainClasses(AdapterTestEntity)
     }
 
     void "test adapt single property projection"() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationHqlQuerySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationHqlQuerySpec.groovy
index 0ff5326efe..64c089c162 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationHqlQuerySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationHqlQuerySpec.groovy
@@ -26,7 +26,7 @@ import org.grails.datastore.mapping.query.Query
 class MutationHqlQuerySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([MutationHqlQuerySpecBook])
+        manager.registerDomainClasses(MutationHqlQuerySpecBook)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationQueryDelegateSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationQueryDelegateSpec.groovy
index b8079c0efb..c7bf2ce344 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationQueryDelegateSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/MutationQueryDelegateSpec.groovy
@@ -30,7 +30,7 @@ import java.lang.reflect.Method
 class MutationQueryDelegateSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([MutationQueryDelegateTestBook])
+        manager.registerDomainClasses(MutationQueryDelegateTestBook)
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectHqlQuerySpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectHqlQuerySpec.groovy
index 3c37ce1528..8d5151df14 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectHqlQuerySpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectHqlQuerySpec.groovy
@@ -30,7 +30,7 @@ import org.grails.datastore.mapping.query.Query
 class SelectHqlQuerySpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([SelectHqlQuerySpecBook, 
SelectHqlQuerySpecAuthor])
+        manager.registerDomainClasses(SelectHqlQuerySpecBook, 
SelectHqlQuerySpecAuthor)
     }
 
     def setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectQueryDelegateSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectQueryDelegateSpec.groovy
index 5b88a1b9a3..3a4f6e1439 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectQueryDelegateSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/SelectQueryDelegateSpec.groovy
@@ -28,7 +28,7 @@ import java.lang.reflect.Method
 class SelectQueryDelegateSpec extends HibernateGormDatastoreSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([SelectQueryDelegateTestBook])
+        manager.registerDomainClasses(SelectQueryDelegateTestBook)
     }
 
     void setup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventListenerSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventListenerSpec.groovy
index 0ddb7fb069..849448366d 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventListenerSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventListenerSpec.groovy
@@ -31,13 +31,13 @@ class ClosureEventListenerSpec extends 
HibernateGormDatastoreSpec {
 
     @Override
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             EventBook,
             ValidatedBook,
             MutatingBook,
             LegacyLoadBook,
             NoEventBook
-        ])
+        )
     }
 
     void cleanup() {
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptorSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptorSpec.groovy
index 449d29053b..15d2d5e4ef 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptorSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptorSpec.groovy
@@ -55,10 +55,10 @@ class ClosureEventTriggeringInterceptorSpec extends 
HibernateGormDatastoreSpec {
 
     @Override
     void setupSpec() {
-        manager.addAllDomainClasses([
+        manager.registerDomainClasses(
             InterceptorBook,
             TimestampedBook,
-        ])
+        )
     }
 
     // 
-------------------------------------------------------------------------
diff --git 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtilsSpec.groovy
 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtilsSpec.groovy
index 29d4b17151..4df0a0956c 100644
--- 
a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtilsSpec.groovy
+++ 
b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtilsSpec.groovy
@@ -35,7 +35,7 @@ class HibernateRuntimeUtilsSpec extends 
HibernateGormDatastoreSpec {
     @Shared ConversionService conversionService
 
     void setupSpec() {
-        manager.addAllDomainClasses([HibernateRuntimeUtilsSpecProfile, 
HibernateRuntimeUtilsSpecAccount])
+        manager.registerDomainClasses(HibernateRuntimeUtilsSpecProfile, 
HibernateRuntimeUtilsSpecAccount)
         def factory = new ConversionServiceFactoryBean()
         factory.afterPropertiesSet()
         conversionService = factory.object
diff --git 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
index 9a54fdc396..4ba4d8f439 100644
--- 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
+++ 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
@@ -52,10 +52,6 @@ abstract class GrailsDataTckManager {
         }
     }
 
-    void addAllDomainClasses(Collection<Class> classes) {
-        registerDomainClasses(*classes)
-    }
-
     void setupSpec() {
         // noop
     }
diff --git 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RLikeSpec.groovy
 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RLikeSpec.groovy
index 614e927d3b..cf5924a432 100644
--- 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RLikeSpec.groovy
+++ 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RLikeSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.IgnoreIf
 class RLikeSpec extends GrailsDataTckSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([RlikeFoo])
+        manager.registerDomainClasses(RlikeFoo)
     }
 
     void "test rlike works"() {
diff --git 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpecHibernate.groovy
 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpecHibernate.groovy
index 0a6db9cb1d..19c601595e 100644
--- 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpecHibernate.groovy
+++ 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpecHibernate.groovy
@@ -32,7 +32,7 @@ import spock.lang.Unroll
 class SizeQuerySpecHibernate extends GrailsDataTckSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([Owner_Default_Bi_P, Child_BT_Default_P])
+        manager.registerDomainClasses(Owner_Default_Bi_P, Child_BT_Default_P)
     }
 
     private void setupTestData() {
diff --git 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ValidationHibernateSpec.groovy
 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ValidationHibernateSpec.groovy
index 60446e9fdc..a535c8e47a 100644
--- 
a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ValidationHibernateSpec.groovy
+++ 
b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ValidationHibernateSpec.groovy
@@ -43,8 +43,8 @@ import org.grails.datastore.mapping.model.PersistentEntity
 class ValidationHibernateSpec extends GrailsDataTckSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([ClassWithListArgBeforeValidate, 
ClassWithNoArgBeforeValidate,
-                                     ClassWithOverloadedBeforeValidate, 
TestEntity, Task])
+        manager.registerDomainClasses(ClassWithListArgBeforeValidate, 
ClassWithNoArgBeforeValidate,
+                                     ClassWithOverloadedBeforeValidate, 
TestEntity, Task)
     }
 
     @Rollback

Reply via email to