Merge pull request #13876 from codeconsole/7.0.x-core-auto

Convert CoreConfiguration to CoreAutoConfiguration

grails-core/build.gradle

@@ -10,6 +10,7 @@ dependencies {
     api "org.springframework:spring-tx"
     api "org.springframework:spring-beans"
     api "org.springframework:spring-context"
+    api "org.springframework.boot:spring-boot-autoconfigure"
 
     compileOnly "org.springframework:spring-test"
     compileOnly "org.apache.groovy:groovy-templates"

grails-core/src/main/groovy/org/grails/plugins/CoreGrailsPlugin.groovy

@@ -25,7 +25,6 @@ import org.grails.spring.DefaultRuntimeSpringConfiguration
 import org.grails.spring.RuntimeSpringConfiguration
 import org.grails.spring.aop.autoproxy.GroovyAwareAspectJAwareAdvisorAutoProxyCreator
 import org.grails.spring.aop.autoproxy.GroovyAwareInfrastructureAdvisorAutoProxyCreator
-import org.grails.spring.context.support.GrailsPlaceholderConfigurer
 import org.grails.spring.context.support.MapBasedSmartPropertyOverrideConfigurer
 import org.grails.spring.RuntimeSpringConfigUtilities
 import org.grails.core.io.DefaultResourceLocator
@@ -66,17 +65,12 @@ class CoreGrailsPlugin extends Plugin {
 
         // Grails config as properties
         def config = application.config
-        def placeHolderPrefix = config.getProperty(Settings.SPRING_PLACEHOLDER_PREFIX, '${')
-
 
         // enable post-processing of @Configuration beans defined by plugins
         grailsConfigurationClassPostProcessor ConfigurationClassPostProcessor
         grailsBeanOverrideConfigurer(MapBasedSmartPropertyOverrideConfigurer) {
             delegate.grailsApplication = application
         }
-        propertySourcesPlaceholderConfigurer(GrailsPlaceholderConfigurer) {
-            placeholderPrefix = placeHolderPrefix
-        }
 
         Class proxyCreatorClazz = null
         // replace AutoProxy advisor with Groovy aware one

grails-core/src/main/groovy/org/grails/plugins/core/CoreAutoConfiguration.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2004-2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.grails.plugins.core;
+
+import grails.config.ConfigProperties;
+import grails.config.Settings;
+import grails.core.GrailsApplication;
+import org.grails.spring.context.support.GrailsPlaceholderConfigurer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.Ordered;
+
+/**
+ * Core beans.
+ *
+ * @author graemerocher
+ * @since 4.0
+ */
+@AutoConfiguration(before = { PropertyPlaceholderAutoConfiguration.class })
+@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
+public class CoreAutoConfiguration {
+
+    @Value("${" + Settings.SPRING_PLACEHOLDER_PREFIX + ":#{null}}")
+    private String placeholderPrefix;
+
+    @Bean
+    @Primary
+    public ClassLoader classLoader(GrailsApplication grailsApplication) {
+        return grailsApplication.getClassLoader();
+    }
+
+    @Bean
+    @Primary
+    public ConfigProperties grailsConfigProperties(GrailsApplication grailsApplication) {
+        return new ConfigProperties(grailsApplication.getConfig());
+    }
+
+    @Bean
+    @Primary
+    PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+        GrailsPlaceholderConfigurer grailsPlaceholderConfigurer = new GrailsPlaceholderConfigurer();
+        if (placeholderPrefix != null) {
+            grailsPlaceholderConfigurer.setPlaceholderPrefix(placeholderPrefix);
+        }
+        return grailsPlaceholderConfigurer;
+    }
+}

grails-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-org.grails.plugins.core.CoreConfiguration
+org.grails.plugins.core.CoreAutoConfiguration

grails-core/src/test/groovy/grails/spring/GrailsPlaceHolderConfigurerCorePluginRuntimeSpec.groovy

@@ -2,6 +2,7 @@ package grails.spring
 
 import grails.core.DefaultGrailsApplication
 import org.grails.plugins.CoreGrailsPlugin
+import org.grails.spring.context.support.GrailsPlaceholderConfigurer
 import spock.lang.Issue
 import spock.lang.Specification
 
@@ -29,6 +30,7 @@ class GrailsPlaceHolderConfigurerCorePluginRuntimeSpec extends Specification{
             plugin.grailsApplication = app
             bb.beans plugin.doWithSpring()
             bb.beans {
+                propertySourcesPlaceholderConfigurer(GrailsPlaceholderConfigurer)
                 testBean(ReplacePropertyBean) {
                     foo = '${foo.bar}'
                 }

grails-web-common/build.gradle

@@ -10,8 +10,6 @@ dependencies {
     compileOnly "jakarta.servlet:jakarta.servlet-api"
     testCompileOnly "org.springframework:spring-test"
 
-    // now used by plugins for autoconfiguration
-    api "org.springframework.boot:spring-boot-autoconfigure"
     api "org.springframework:spring-webmvc"
     api "org.springframework:spring-context-support"
     implementation "com.github.ben-manes.caffeine:caffeine"