grails#13840 - Add back @entity for GORM Inheritance

jdaugherty · Dec 10, 2024 · ddad54a · ddad54a
1 parent c356409
commit ddad54a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 190 deletions.
diff --git a/...t-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy b/...t-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/...s-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy b/...s-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 {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    // 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 {
@@ Expand Down @@