Merge pull request graceframework#1135 from rainboyan/refactor-core-api

Refactor the core API of the framework

Closes graceframeworkgh-1136

Author: rainboyan

build.gradle

@@ -267,7 +267,7 @@ subprojects { project ->
     if (project.name == 'grace-dependencies') return
     if (project.name == 'grace-bom') return
 
-    jar{
+    jar {
         manifest.mainAttributes(
             "Built-By": System.properties['user.name'],
             "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",

grace-api/src/main/groovy/grails/core/ArtefactHandlerAdapter.java

@@ -19,6 +19,7 @@ dependencies {
     api libs.spring.web
 
     compileOnly libs.jsr305
+    compileOnly libs.spring.boot.devtools
 
     testImplementation project(":grace-plugin-controllers")
     testImplementation project(":grace-test")

grace-boot/build.gradle

@@ -15,8 +15,13 @@
  */
 package grails.boot;
 
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+
 import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.ResourceLoader;
@@ -81,6 +86,14 @@ protected void configureBanner(Environment environment) {
         }
     }
 
+    @Override
+    protected void load(ApplicationContext context, Object[] sources) {
+        super.load(context, sources);
+        if (context instanceof AbstractApplicationContext) {
+            ((AbstractApplicationContext) context).getBeanFactory().registerSingleton("PRIMARY_SOURCES", new LinkedHashSet<>(Arrays.asList(sources)));
+        }
+    }
+
     /**
      * Static helper that can be used to run a {@link Grails} from the
      * specified source using default settings.

grace-boot/src/main/groovy/grails/boot/Grails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -146,7 +147,7 @@ protected final void initializeGrailsApplication(ApplicationContext applicationC
         Environment.setInitializing(true);
         this.grailsApplication.setApplicationContext(applicationContext);
         this.grailsApplication.setMainContext(applicationContext);
-        this.classes = loadArtefactClasses();
+        this.classes = loadArtefactClasses(applicationContext);
         this.classes.stream().filter(GrailsPluginArtefactHandler::isGrailsPlugin)
                 .forEach(this.pluginManager::addUserPlugin);
         customizePluginManager(this.pluginManager);
@@ -180,17 +181,29 @@ protected void performGrailsInitializationSequence() {
         this.classes.forEach(this.grailsApplication::addArtefact);
     }
 
-    protected Set<Class<?>> loadArtefactClasses() {
+    protected Set<Class<?>> loadArtefactClasses(ApplicationContext applicationContext) {
         StartupStep artefactStep = this.applicationStartup.start("grails.application.artefact-classes.loaded");
-        GrailsComponentScanner scanner = new GrailsComponentScanner(this.applicationContext, this.applicationStartup);
-        Set<Class<?>> classes;
+        GrailsComponentScanner scanner = new GrailsComponentScanner(applicationContext, this.applicationStartup);
+        Set<Class<?>> classes = new LinkedHashSet<>();
         try {
-            classes = scanner.scan(Artefact.class);
+            classes.addAll(scanner.scan(Artefact.class));
         }
         catch (ClassNotFoundException ignored) {
-            classes = Collections.emptySet();
         }
-
+        if (applicationContext.containsBean("PRIMARY_SOURCES")) {
+            Object primarySourcesBean = applicationContext.getBean("PRIMARY_SOURCES");
+            try {
+                if (primarySourcesBean instanceof Set<?>) {
+                    for (Object source : (Set<?>) primarySourcesBean) {
+                        if (source instanceof Class<?>) {
+                            classes.add((Class<?>) source);
+                        }
+                    }
+                }
+            }
+            catch (Exception ignored) {
+            }
+        }
         artefactStep.tag("classCount", String.valueOf(classes.size())).end();
         return classes;
     }