Don't init logging during compilation. Fixes #10514

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/io/IOUtils.groovy

@@ -230,7 +230,7 @@ class IOUtils extends SpringIOUtils {
 
 
     @Memoized
-    public static File findApplicationDirectoryFile() {
+    static File findApplicationDirectoryFile() {
         def directory = findApplicationDirectory()
         if(directory) {
             def f = new File(directory)
@@ -248,7 +248,7 @@ class IOUtils extends SpringIOUtils {
      * @param targetClass The target class
      * @return The application directory or null if it can't be found
      */
-    public static File findApplicationDirectoryFile(Class targetClass) {
+    static File findApplicationDirectoryFile(Class targetClass) {
 
         def rootResource = findRootResource(targetClass)
         if(rootResource != null) {
@@ -267,8 +267,46 @@ class IOUtils extends SpringIOUtils {
         return null
     }
 
+    /**
+     * Finds a source file for the given class name
+     *
+     * @param className The class name
+     * @return The source file
+     */
+    @Memoized
+    static File findSourceFile(String className) {
+        File applicationDir = BuildSettings.BASE_DIR
+        File file = null
+        if(applicationDir != null) {
+            String fileName = className.replace('.' as char, File.separatorChar) + '.groovy'
+            List<File> allFiles = [ new File(applicationDir, "src/main/groovy") ]
+            File[] files = new File(applicationDir, "grails-app").listFiles(new FileFilter() {
+                @Override
+                boolean accept(File f) {
+                    return f.isDirectory() && !f.isHidden() && !f.name.startsWith('.')
+                }
+            })
+            if(files != null) {
+                allFiles.addAll( Arrays.asList(files) )
+            }
+            for(File dir in allFiles) {
+                File possibleFile = new File(dir, fileName)
+                if(possibleFile.exists()) {
+                    file = possibleFile
+                    break
+                }
+            }
+
+        }
+        return file
+    }
+
+    /**
+     * Finds the directory where the Application class is contained
+     * @return The application directory
+     */
     @Memoized
-    public static String findApplicationDirectory() {
+    static String findApplicationDirectory() {
         if(applicationDirectory) {
             return applicationDirectory
         }
@@ -296,10 +334,10 @@ class IOUtils extends SpringIOUtils {
                 final Class<?> mainClass = Thread.currentThread().contextClassLoader.loadClass(mainClassName)
                 final URL classResource = mainClass ? findClassResource(mainClass) : null
                 if(classResource) {
-                    def file = new UrlResource(classResource).getFile()
-                    def path = file.canonicalPath
+                    File file = new UrlResource(classResource).getFile()
+                    String path = file.canonicalPath
 
-                    def buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
+                    String buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
                     if(path.contains(buildClassespath)) {
                         location = path.substring(0, path.indexOf(buildClassespath) - 1)
                     }
@@ -312,6 +350,6 @@ class IOUtils extends SpringIOUtils {
             // ignore
         }
         applicationDirectory = location
-        return location;
+        return location
     }
 }

grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy

@@ -15,6 +15,8 @@
  */
 package org.grails.plugins.web.rest.transform
 
+import grails.io.IOUtils
+
 import static java.lang.reflect.Modifier.*
 import static org.grails.compiler.injection.GrailsASTUtils.*
 import grails.artefact.Artefact
@@ -69,8 +71,6 @@ import org.grails.compiler.injection.GrailsAwareInjectionOperation
 import org.grails.compiler.injection.TraitInjectionUtils
 import org.grails.compiler.web.ControllerActionTransformer
 import org.grails.core.artefact.ControllerArtefactHandler
-import org.grails.core.io.DefaultResourceLocator
-import org.grails.core.io.ResourceLocator
 import org.grails.transaction.transform.TransactionalTransform
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
@@ -99,18 +99,8 @@ class ResourceTransform implements ASTTransformation, CompilationUnitAware {
     public static final String REDIRECT_METHOD = "redirect"
     public static final ClassNode AUTOWIRED_CLASS_NODE = new ClassNode(Autowired).getPlainNodeReference()
 
-    private ResourceLocator resourceLocator
     private CompilationUnit unit
 
-    ResourceLocator getResourceLocator() {
-        if (resourceLocator == null) {
-            resourceLocator = new DefaultResourceLocator()
-            String basedir = BuildSettings.BASE_DIR.absolutePath
-
-            resourceLocator.setSearchLocation(basedir)
-        }
-        return resourceLocator
-    }
 
     @Override
     void visit(ASTNode[] astNodes, SourceUnit source) {
@@ -124,10 +114,8 @@ class ResourceTransform implements ASTTransformation, CompilationUnitAware {
             return
         }
 
-        final resourceLocator = getResourceLocator()
-        final className = "${parent.name}${ControllerArtefactHandler.TYPE}"
-        final resource = resourceLocator.findResourceForClassName(className)
-
+        String className = "${parent.name}${ControllerArtefactHandler.TYPE}"
+        final File resource = IOUtils.findSourceFile(className)
         LinkableTransform.addLinkingMethods(parent)
 
         if (resource == null) {