Skip to content

Commit 6c7883c

Browse files
Revert "improve domain class detection"
This reverts commit 66e234c.
1 parent 66e234c commit 6c7883c

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -726,11 +726,16 @@ public static boolean isDomainClass(final ClassNode classNode, final SourceUnit
726726

727727
if (!isDomainClass && sourceNode != null) {
728728
final String sourcePath = sourceNode.getName();
729-
final int indexOfGrailsAppDir = sourcePath.lastIndexOf("grails-app");
730-
if(indexOfGrailsAppDir >= 0) {
731-
final String relativePathToDomainSourceFile = classNode.getName().replaceAll("\\.", File.separator) + ".groovy";
732-
final String pathToDomainSourceFile = sourcePath.substring(0, indexOfGrailsAppDir + 11) + DOMAIN_DIR + File.separator + relativePathToDomainSourceFile;
733-
isDomainClass = new File(pathToDomainSourceFile).exists();
729+
final File sourceFile = new File(sourcePath);
730+
File parent = sourceFile.getParentFile();
731+
while (parent != null && !isDomainClass) {
732+
final File parentParent = parent.getParentFile();
733+
if (parent.getName().equals(DOMAIN_DIR) &&
734+
parentParent != null &&
735+
parentParent.getName().equals(GRAILS_APP_DIR)) {
736+
isDomainClass = true;
737+
}
738+
parent = parentParent;
734739
}
735740
}
736741

0 commit comments

Comments
 (0)