Migrate auto-configurations to @autoConfiguration

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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,8 +18,8 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
@@ -34,7 +34,7 @@
  * @see org.springframework.context.annotation.Configuration
  * @see GrailsApplicationPostProcessor
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureOrder(10000)
 @Import(GrailsAutoConfiguration.GrailsRegistrar.class)
 public class GrailsAutoConfiguration {

grails-boot/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,3 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-grails.boot.config.GrailsAutoConfiguration
-
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\
 org.grails.boot.context.GrailsConfigurationWarningsApplicationContextInitializer

grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsDynamicModuleConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -16,14 +16,14 @@
 package org.grails.plugins.config;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
 
 import org.grails.plugins.support.GrailsDynamicPluginRegistryPostProcessor;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureOrder
 public class GrailsDynamicModuleConfiguration {
 

grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsPluginManagerConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -16,8 +16,8 @@
 package org.grails.plugins.config;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import grails.plugins.GrailsPluginManager;
 
@@ -29,7 +29,7 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 public class GrailsPluginManagerConfiguration {
 
     @Bean

grails-plugin-api/src/main/resources/META-INF/spring.factories

@@ -1,8 +1,3 @@
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\
 org.grails.plugins.support.GrailsPluginsInfoApplicationContextInitializer
-
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.grails.plugins.config.GrailsDynamicModuleConfiguration,\
-org.grails.plugins.config.GrailsPluginManagerConfiguration

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsPluginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2023 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.
@@ -16,9 +16,9 @@
 package org.grails.plugins.codecs;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 import grails.core.GrailsApplication;
@@ -32,7 +32,7 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 public class CodecsPluginConfiguration {
 
     @Bean

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersPluginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -23,7 +23,7 @@
 import javax.servlet.Servlet;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -35,7 +35,6 @@
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.filter.OrderedFilter;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -60,10 +59,9 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(before = { WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class })
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass({ Servlet.class })
-@AutoConfigureBefore({ WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class })
 public class ControllersPluginConfiguration {
 
     @Bean

grails-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java

@@ -16,10 +16,10 @@
 package org.grails.plugins.core;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 import grails.config.ConfigProperties;
@@ -32,7 +32,7 @@
  * @author Michael Yan
  * @since 4.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureOrder
 public class CoreConfiguration {
 

grails-plugin-core/src/main/groovy/org/grails/plugins/core/PropertyPlaceholderConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -16,14 +16,13 @@
 package org.grails.plugins.core;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 import grails.config.Config;
@@ -40,9 +39,8 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(before = PropertyPlaceholderAutoConfiguration.class)
 @AutoConfigureOrder(10010)
-@AutoConfigureBefore(PropertyPlaceholderAutoConfiguration.class)
 public class PropertyPlaceholderConfiguration {
 
     @Bean

grails-plugin-core/src/main/resources/META-INF/spring.factories

@@ -2,8 +2,3 @@
 org.springframework.boot.env.PropertySourceLoader=\
 org.grails.spring.boot.env.GroovyConfigPropertySourceLoader,\
 org.grails.spring.boot.env.YamlPropertySourceLoader
-
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.grails.plugins.core.CoreConfiguration,\
-org.grails.plugins.core.PropertyPlaceholderConfiguration

grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java

@@ -19,8 +19,8 @@
 import java.math.BigInteger;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
 
 import grails.databinding.TypedStructuredBindingEditor;
@@ -34,7 +34,7 @@
 /**
  * Default converters configuration.
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 public class DefaultConvertersConfiguration {
 
     private final DataBindingConfigurationProperties configurationProperties;

grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java

@@ -16,12 +16,12 @@
 package org.grails.plugins.databinding;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 import grails.core.GrailsApplication;
@@ -49,7 +49,7 @@
  *
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureOrder
 @EnableConfigurationProperties(DataBindingConfigurationProperties.class)
 @ImportAutoConfiguration(DefaultConvertersConfiguration.class)

grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsI18nPluginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2023 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.
@@ -15,13 +15,13 @@
  */
 package org.grails.plugins.i18n;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.LocaleResolver;
@@ -39,7 +39,7 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 8)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass(ParamsAwareLocaleChangeInterceptor.class)

grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2023 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.
@@ -16,15 +16,14 @@
 package org.grails.plugins.i18n;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.MessageSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
 
 import grails.config.Config;
@@ -40,8 +39,7 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(MessageSourceAutoConfiguration.class)
+@AutoConfiguration(before = MessageSourceAutoConfiguration.class)
 public class GrailsMessageSourceConfiguration {
 
     @Bean

grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsPluginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -16,10 +16,10 @@
 package org.grails.plugins.web.interceptors;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.handler.MappedInterceptor;
 
 import grails.artefact.Interceptor;
@@ -30,7 +30,7 @@
  * @author Michael Yan
  * @since 2022.0.0
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 public class InterceptorsPluginConfiguration {