Perform check that parent entity is domain class before adding it as …

…parent. Fixes grails/grails-core#9678 and Fixes grails/grails-core#9692
grails · Feb 25, 2016 · 6a1272c · 6a1272c
1 parent 028bd7c
commit 6a1272c
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 16 deletions.
diff --git a/...st/groovy/org/grails/orm/hibernate/BidirectionalOneToManyAndCircularOneToManyTests.groovy b/...st/groovy/org/grails/orm/hibernate/BidirectionalOneToManyAndCircularOneToManyTests.groovy
@@ -1,6 +1,7 @@
 package org.grails.orm.hibernate
 
 import grails.core.GrailsDomainClass
+import grails.persistence.Entity
 
 import static junit.framework.Assert.*
 import org.junit.Test
@@ -60,6 +61,7 @@ class BidirectionalOneToManyAndCircularOneToManyTests extends AbstractGrailsHibe
     }
 }
 
+@Entity
 class BidirectionalOneToManyAndCircularOneToManyUser implements java.io.Serializable {
     Long id
     Long version
@@ -74,13 +76,15 @@ class BidirectionalOneToManyAndCircularOneToManyUser implements java.io.Serializ
     BidirectionalOneToManyAndCircularOneToManyUser manager
 }
 
+@Entity
 class BidirectionalOneToManyAndCircularOneToManyUploadLog implements Serializable {
     Long id
     Long version
     static belongsTo = BidirectionalOneToManyAndCircularOneToManyUser
     BidirectionalOneToManyAndCircularOneToManyUser sender
 }
 
+@Entity
 class BidirectionalOneToManyAndCircularOneToManyUpload implements Serializable {
     Long id
     Long version

diff --git a/src/test/groovy/org/grails/orm/hibernate/CircularOneToManyTests.groovy b/src/test/groovy/org/grails/orm/hibernate/CircularOneToManyTests.groovy
@@ -1,5 +1,6 @@
 package org.grails.orm.hibernate
 
+import grails.persistence.Entity
 import org.junit.Test
 
 import static junit.framework.Assert.*
@@ -26,12 +27,9 @@ class CircularOneToManyTests extends AbstractGrailsHibernateTests {
     }
 }
 
+@Entity
 class CircularOneToManyTask {
-    Long id
-    Long version
-    Set tasks
     CircularOneToManyTask task
     static belongsTo = CircularOneToManyTask
     static hasMany = [tasks:CircularOneToManyTask]
 }
-
diff --git a/src/test/groovy/org/grails/orm/hibernate/ListDomainTests.groovy b/src/test/groovy/org/grails/orm/hibernate/ListDomainTests.groovy
@@ -1,5 +1,6 @@
 package org.grails.orm.hibernate
 
+import grails.persistence.Entity
 
 import static junit.framework.Assert.*
 import org.junit.Test
@@ -28,13 +29,15 @@ class ListDomainTests extends AbstractGrailsHibernateTests{
     }
 }
 
+@Entity
 class ListDomainBook {
     Long id
     Long version
     List authors
     static hasMany = [authors:ListDomainAuthor]
 }
 
+@Entity
 class ListDomainAuthor {
     Long id
     Long version

diff --git a/src/test/groovy/org/grails/orm/hibernate/ManyToManyAndOneToOneTests.groovy b/src/test/groovy/org/grails/orm/hibernate/ManyToManyAndOneToOneTests.groovy
@@ -36,6 +36,7 @@ class ManyToManyAndOneToOneTests extends AbstractGrailsHibernateTests {
     }
 }
 
+@grails.persistence.Entity
 class ManyToManyAndOneToOneBook {
     Long version
     Long id
@@ -47,6 +48,7 @@ class ManyToManyAndOneToOneBook {
     String title
 }
 
+@grails.persistence.Entity
 class ManyToManyAndOneToOneAuthor {
     Long version
     Long id

diff --git a/src/test/groovy/org/grails/orm/hibernate/MapDomainTests.groovy b/src/test/groovy/org/grails/orm/hibernate/MapDomainTests.groovy
@@ -1,5 +1,7 @@
 package org.grails.orm.hibernate
 
+import grails.persistence.Entity
+
 import static junit.framework.Assert.*
 import org.junit.Test
 
@@ -33,14 +35,14 @@ class MapDomainTests extends AbstractGrailsHibernateTests{
     }
 }
 
+@Entity
 class MapDomainBook {
-    Long id
-    Long version
     Map simpleAuthors
     Map authors
     static hasMany = [authors:MapDomainAuthor]
 }
 
+@Entity
 class MapDomainAuthor {
     Long id
     Long version

diff --git a/src/test/groovy/org/grails/orm/hibernate/OneToOneSelfReferencedViaInheritanceTests.groovy b/src/test/groovy/org/grails/orm/hibernate/OneToOneSelfReferencedViaInheritanceTests.groovy
@@ -31,6 +31,7 @@ class OneToOneSelfReferencedViaInheritanceTests extends AbstractGrailsHibernateT
     }
 }
 
+@grails.persistence.Entity
 class OneToOneSelfReferencedViaInheritanceContent implements Serializable {
     Long id
     Long version
@@ -42,11 +43,13 @@ class OneToOneSelfReferencedViaInheritanceContent implements Serializable {
     }
 }
 
+@grails.persistence.Entity
 class OneToOneSelfReferencedViaInheritanceVersion extends OneToOneSelfReferencedViaInheritanceContent {
     Integer number
     OneToOneSelfReferencedViaInheritanceContent current
 }
 
+@grails.persistence.Entity
 class OneToOneSelfReferencedViaInheritanceWikiPage extends OneToOneSelfReferencedViaInheritanceContent {
     Set versions
     static hasMany = [versions:OneToOneSelfReferencedViaInheritanceVersion]

diff --git a/src/test/groovy/org/grails/orm/hibernate/SimpleBelongsToMappingTests.groovy b/src/test/groovy/org/grails/orm/hibernate/SimpleBelongsToMappingTests.groovy
@@ -1,5 +1,7 @@
 package org.grails.orm.hibernate
 
+import grails.persistence.Entity
+
 import static junit.framework.Assert.*
 import org.junit.Test
 
@@ -20,13 +22,15 @@ class SimpleBelongsToMappingTests extends AbstractGrailsHibernateTests {
     }
 }
 
+@Entity
 class SimpleBelongsToMappingBook {
     Long id
     Long version
     SimpleBelongsToMappingAuthor author
     static belongsTo = [author:SimpleBelongsToMappingAuthor]
 }
 
+@Entity
 class SimpleBelongsToMappingAuthor {
     Long id
     Long version