You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ma...@apache.org on 2026/06/15 14:07:06 UTC

(grails-core) branch 8.0.x-hibernate7 updated (b416cc39bd -> 6bc25ec1bf)

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

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


    from b416cc39bd test: fix package after merge
     new 2b8bf814af test: fix another package location after merge
     new 6bc25ec1bf test: remove duplicate `setupSpec()` method

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy      | 8 ++------
 .../groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)


(grails-core) 02/02: test: remove duplicate `setupSpec()` method

Posted by ma...@apache.org.
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

commit 6bc25ec1bfc67260967b76357f5028127cfe26dd
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Mon Jun 15 16:06:50 2026 +0200

    test: remove duplicate `setupSpec()` method
    
    After a merge, `Hibernate7OptimisticLockingSpec` had two `setupSpec()`
    methods.
---
 .../grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy
index 88d1e22bdb..3447418824 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/Hibernate7OptimisticLockingSpec.groovy
@@ -27,8 +27,8 @@ import org.springframework.dao.OptimisticLockingFailureException
  */
 class Hibernate7OptimisticLockingSpec extends HibernateGormDatastoreSpec {
 
-    def setupSpec() {
-        manager.addAllDomainClasses([OptLockVersioned, OptLockNotVersioned])
+    void setupSpec() {
+        manager.registerDomainClasses(OptLockVersioned, OptLockNotVersioned)
     }
 
     void "Test versioning"() {
@@ -59,10 +59,6 @@ class Hibernate7OptimisticLockingSpec extends HibernateGormDatastoreSpec {
         o.version == 1
     }
 
-    void setupSpec() {
-        manager.registerDomainClasses(OptLockVersioned, OptLockNotVersioned)
-    }
-
     void "Test optimistic locking"() {
 
         given:


(grails-core) 01/02: test: fix another package location after merge

Posted by ma...@apache.org.
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

commit 2b8bf814af3a2fa84ffeac025b05eea6fb980628
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Mon Jun 15 16:05:22 2026 +0200

    test: fix another package location after merge
    
    Merge changed package back to `grails.gorm.tests`.
    Align package and imports accordingly.
---
 .../test/groovy/grails/gorm/tests/HibernateMappingFactorySpec.groovy    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5514b32cf1..765112812d 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
@@ -391,7 +391,7 @@ class MappingFactoryMetadata {
 class MappingFactoryCustomIdEntity implements HibernateEntity<MappingFactoryCustomIdEntity> {
     String name
     static mapping = {
-        id generator: 'grails.gorm.specs.FactoryCustomType', type: 'uuid-binary'
+        id generator: 'grails.gorm.tests.FactoryCustomType', type: 'uuid-binary'
     }
 }