Print error if classes found in default package and avoid scanning default package if not necessary

Author: graemerocher

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

@@ -44,6 +44,7 @@ class ResourceUtils extends GrailsResourceUtils {
         File rootDir = baseDir ? new File(baseDir, "grails-app") : null
         Set<String> packageNames = []
         if (rootDir?.exists()) {
+            File[] allFiles = rootDir.listFiles()
             rootDir.eachDir { File dir ->
                 def dirName = dir.name
                 if (!dir.hidden && !dirName.startsWith('.') && !['conf', 'i18n', 'assets', 'views'].contains(dirName)) {
@@ -78,6 +79,11 @@ class ResourceUtils extends GrailsResourceUtils {
 
                     }
                 }
+                else {
+                    if(dir.name.endsWith('.groovy') && prefix == "") {
+                        packageNames.add("")
+                    }
+                }
             }
         }
     }

grails-core/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.groovy

@@ -31,6 +31,7 @@ import java.lang.reflect.Field
  *
  */
 @CompileStatic
+@Slf4j
 class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationContextAware {
 
     private static final String APC_PRIORITY_LIST_FIELD = "APC_PRIORITY_LIST";
@@ -75,15 +76,24 @@ class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationCont
             if(ignoredRootPackages().contains(pkg)) {
                continue
             }
-            String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX +
-                    ClassUtils.convertClassNameToResourcePath(pkg) + Settings.CLASS_RESOURCE_PATTERN;
+            // if it is the default package
+            if(pkg == "") {
+                // try the default package in case of a script without recursing into subpackages
+                log.error("The application defines a Groovy source using the default package. Please move all Groovy sources into a package.")
+                String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX +  "*.class"
+                classes.addAll scanUsingPattern(pattern, readerFactory)
+            }
+            else {
+
+                String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX +
+                        ClassUtils.convertClassNameToResourcePath(pkg) + Settings.CLASS_RESOURCE_PATTERN;
+
+
+                classes.addAll scanUsingPattern(pattern, readerFactory)
+            }
 
-            classes.addAll scanUsingPattern(pattern, readerFactory)
         }
 
-        // try the default package in case of a script without recursing into subpackages
-        String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX +  "*.class"
-        classes.addAll scanUsingPattern(pattern, readerFactory)
 
         def classLoader = Thread.currentThread().contextClassLoader
         for(cls in AbstractGrailsArtefactTransformer.transformedClassNames) {
@@ -224,10 +234,10 @@ class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationCont
 
             this.rootResource = getURLs()[0]
             this.applicationClass = applicationClass
-            def urlStr = rootResource.toString()
+            String urlStr = rootResource.toString()
             jarDeployed = urlStr.startsWith("jar:")
             try {
-                def withoutBang = new URL("${urlStr.substring(0, urlStr.length() - 2)}/")
+                URL withoutBang = new URL("${urlStr.substring(0, urlStr.length() - 2)}/")
                 addURL(withoutBang)
 
             } catch (MalformedURLException e) {