GRAILS-6662 - improving the handling of domain classes that extend Ja…

…va classes under src/java. This work is still pending testing, specifically as it relates to GRAILS-6405 and GRAILS-3209.

src/java/org/codehaus/groovy/grails/compiler/injection/DefaultGrailsDomainClassInjector.java

@@ -196,19 +196,15 @@ private void injectVersionProperty(ClassNode classNode) {
         final boolean hasVersion = GrailsASTUtils.hasOrInheritsProperty(classNode, GrailsDomainClassProperty.VERSION);
 
         if (!hasVersion) {
-            ClassNode parent = GrailsASTUtils.getFurthestParent(classNode);
-            parent.addProperty(GrailsDomainClassProperty.VERSION, Modifier.PUBLIC, new ClassNode(Long.class), null, null, null);
+            classNode.addProperty(GrailsDomainClassProperty.VERSION, Modifier.PUBLIC, new ClassNode(Long.class), null, null, null);
         }
     }
 
     private void injectIdProperty(ClassNode classNode) {
         final boolean hasId = GrailsASTUtils.hasOrInheritsProperty(classNode, GrailsDomainClassProperty.IDENTITY);
 
         if (!hasId) {
-            // inject into furthest relative
-            ClassNode parent = GrailsASTUtils.getFurthestParent(classNode);
-
-            parent.addProperty(GrailsDomainClassProperty.IDENTITY, Modifier.PUBLIC, new ClassNode(Long.class), null, null, null);
+            classNode.addProperty(GrailsDomainClassProperty.IDENTITY, Modifier.PUBLIC, new ClassNode(Long.class), null, null, null);
         }
     }
 

src/test/org/codehaus/groovy/grails/orm/hibernate/AbstractJavaClass.java

@@ -0,0 +1,4 @@
+package org.codehaus.groovy.grails.orm.hibernate;
+
+public class AbstractJavaClass {
+}

src/test/org/codehaus/groovy/grails/orm/hibernate/JavaInheritanceTests.groovy

@@ -0,0 +1,19 @@
+package org.codehaus.groovy.grails.orm.hibernate
+
+class JavaInheritanceTests extends AbstractGrailsHibernateTests{
+    protected void onSetUp() {
+        gcl.parseClass '''
+import grails.persistence.*
+
+@Entity
+class MyDomainClass extends org.codehaus.groovy.grails.orm.hibernate.AbstractJavaClass {
+  String someProperty
+}
+'''
+    }
+
+    void testInheritingFromAbstractJavaClass() {
+        def mdc = ga.getDomainClass("MyDomainClass")
+        assertNotNull 'MyDomainClass is not considered a domain class', mdc
+    }
+}