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 9dde68c27c65cc9f196beb7ebfd77e57647cda21 Author: Mattias Reichel <[email protected]> AuthorDate: Mon Jun 15 16:29:27 2026 +0200 test: remove redundant annotations --- .../groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy | 6 ++---- .../gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) 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 4845fa59c3..3782012330 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 @@ -19,8 +19,6 @@ package grails.gorm.tests -import org.jetbrains.annotations.NotNull - import grails.gorm.annotation.Entity import static grails.gorm.hibernate.mapping.MappingBuilder.define @@ -70,7 +68,7 @@ class CompositeIdParent implements Serializable, Comparable<CompositeIdParent> { } @Override - int compareTo(@NotNull CompositeIdParent o) { + int compareTo(CompositeIdParent o) { this.name <=> o.name ?: this.last <=> o.last } } @@ -90,4 +88,4 @@ class CompositeIdChild implements Comparable<CompositeIdChild> { int compareTo(CompositeIdChild other) { foo <=> other.foo } -} \ No newline at end of file +} 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 960cacc7af..d0c0751e02 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 @@ -21,9 +21,7 @@ package grails.gorm.tests import grails.gorm.annotation.Entity import grails.gorm.transactions.Rollback -import jakarta.annotation.Nonnull -//import org.jetbrains.annotations.NotNull import spock.lang.Issue /** @@ -116,4 +114,4 @@ class ToothDisease implements Serializable, Comparable<ToothDisease> { result = 31 * result + nrVersion.hashCode() return result } -} \ No newline at end of file +}
