#13840 - Add back @entity for GORM Inheritance (#13915)

jdaugherty · web-flow · commit 20862d98a282 · 2024-12-11T16:50:45.000-05:00
* #13840 - Add back @entity for GORM Inheritance * #13690 - feedback - add tests using is form of little boolean
diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy b/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy
@@ -1804,7 +1804,7 @@ class Widget {
     }
 }
 
-// Since Groovy 4, parent domain classes cannot be annotated with @Entity (https://issues.apache.org/jira/browse/GROOVY-5106)
+@Entity
 @Sortable(includes = ['isBindable', 'isNotBindable'])
 @SuppressWarnings('unused')
 class ParentWidget implements Validateable {
diff --git a/grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy
@@ -138,7 +138,7 @@ class EntityTransformTests extends Specification {
 
             import grails.persistence.*
     
-            // Since Groovy 4 parent domain classes cannot be annotated with @Entity: https://issues.apache.org/jira/browse/GROOVY-5106
+            @Entity
             class Personnel {
                 String lastName
                 String firstName
diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy
@@ -28,7 +28,7 @@ class InheritanceWithValidationTests extends Specification implements DataTest {
     }
 }
 
-// Since Groovy 4, parent domain classes cannot be annotated with @Entity (https://issues.apache.org/jira/browse/GROOVY-5106)
+@Entity
 @SuppressWarnings('unused')
 class AbstractCustomPropertyValue implements Validateable {
 
diff --git a/grails-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy

Original file line number	Diff line number	Diff line change
`@@ -1804,7 +1804,7 @@ class Widget {`
`1804`	`1804`	`}`
`1805`	`1805`	`}`
`1806`	`1806`
`1807`		`-// Since Groovy 4, parent domain classes cannot be annotated with @Entity (https://issues.apache.org/jira/browse/GROOVY-5106)`
	`1807`	`+@Entity`
`1808`	`1808`	`@Sortable(includes = ['isBindable', 'isNotBindable'])`
`1809`	`1809`	`@SuppressWarnings('unused')`
`1810`	`1810`	`class ParentWidget implements Validateable {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class InheritanceWithValidationTests extends Specification implements DataTest {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-// Since Groovy 4, parent domain classes cannot be annotated with @Entity (https://issues.apache.org/jira/browse/GROOVY-5106)`
	`31`	`+@Entity`
`32`	`32`	`@SuppressWarnings('unused')`
`33`	`33`	`class AbstractCustomPropertyValue implements Validateable {`
`34`	`34`