Merge branch '7.0.x' into 7.0.x-i18n-autoconfiguration

Author: codeconsole

grails-bootstrap/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     // when used by grails-gradle-plugin
     // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
     implementation "org.springframework:spring-context"
-    api "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
 
 
     compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"

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

@@ -3,7 +3,7 @@
 import grails.config.Settings;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
-import org.grails.spring.config.http.GrailsFilters;
+import org.grails.web.config.http.GrailsFilters;
 import org.grails.web.filters.HiddenHttpMethodFilter;
 import org.grails.web.servlet.mvc.GrailsWebRequestFilter;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +16,6 @@
 import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
 import java.util.EnumSet;

grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/AbstractMimeTypesGrailsPlugin.groovy

@@ -27,7 +27,6 @@ import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
 import org.grails.web.mime.DefaultMimeTypeResolver
 import org.grails.web.mime.DefaultMimeUtility
-import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
@@ -43,12 +42,10 @@ import org.springframework.context.annotation.Primary
 class MimeTypesConfiguration {
 
     private final GrailsApplication grailsApplication
-    private final ApplicationContext applicationContext
     private final List<MimeTypeProvider> mimeTypeProviders
 
     MimeTypesConfiguration(GrailsApplication grailsApplication, List<MimeTypeProvider> mimeTypeProviders) {
         this.grailsApplication = grailsApplication
-        this.applicationContext = grailsApplication.getMainContext()
         this.mimeTypeProviders = mimeTypeProviders
     }
 
@@ -86,7 +83,7 @@ class MimeTypesConfiguration {
 
             final List<MimeTypeProvider> mimeTypeProviders = this.mimeTypeProviders
             processProviders(mimes, mimeTypeProviders)
-            final Map<String, MimeTypeProvider> childTypes = applicationContext.getBeansOfType(MimeTypeProvider.class)
+            final Map<String, MimeTypeProvider> childTypes = grailsApplication.mainContext.getBeansOfType(MimeTypeProvider.class)
             processProviders(mimes, childTypes.values())
             mimeTypes = mimes.toArray(new MimeType[0])
         }

grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesConfiguration.groovy

@@ -23,17 +23,10 @@ import grails.util.GrailsUtil
  *
  * @author Graeme Rocher
  * @since 1.0
- * @deprecated Use {@link MimeTypesConfiguration} instead
  */
-@Deprecated
-class MimeTypesGrailsPlugin extends AbstractMimeTypesGrailsPlugin {
+class MimeTypesGrailsPlugin {
 
     def version = GrailsUtil.getGrailsVersion()
     def dependsOn = [core:version, controllers:version]
     def observe = ['controllers']
-
-    @Override
-    Closure doWithSpring() {
-        return super.doWithSpring()
-    }
 }

grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesFactoryBean.groovy

@@ -1,8 +1,10 @@
 package grails.web.mime
 
 import grails.core.DefaultGrailsApplication
-import org.grails.plugins.web.mime.MimeTypesFactoryBean
+import grails.spring.BeanBuilder
+import org.grails.plugins.web.mime.MimeTypesConfiguration
 import org.grails.web.mime.DefaultMimeUtility
+import org.springframework.context.ApplicationContext
 import spock.lang.Specification
 
 /**
@@ -26,10 +28,15 @@ class MimeUtilitySpec extends Specification {
                       multipartForm: 'multipart/form-data'
                     ]
 
-        final factory = new MimeTypesFactoryBean(grailsApplication: ga)
+        def bb = new BeanBuilder()
+        bb.beans {
+            grailsApplication = ga
+            mimeConfiguration(MimeTypesConfiguration, ga, [])
+        }
+        ga.setApplicationContext(bb.createApplicationContext())
 
-        def mimeTypes = factory.getObject()
-        return new DefaultMimeUtility(mimeTypes)
+        MimeTypesConfiguration mimeTypesConfiguration = ga.mainContext.getBean(MimeTypesConfiguration)
+        return new DefaultMimeUtility(mimeTypesConfiguration.mimeTypes())
     }
 
     void "Test get mime by extension method"() {

grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesGrailsPlugin.groovy

@@ -9,7 +9,6 @@ import grails.web.mime.MimeType
 import org.grails.config.PropertySourcesConfig
 import org.grails.core.lifecycle.ShutdownOperations
 import org.grails.plugins.web.mime.MimeTypesConfiguration
-import org.grails.plugins.web.mime.MimeTypesFactoryBean
 import org.grails.web.mime.DefaultMimeUtility
 import org.springframework.context.ApplicationContext
 import org.springframework.context.support.GenericApplicationContext

grails-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy

@@ -7,6 +7,7 @@ import grails.persistence.Entity
 import grails.rest.Linkable
 import grails.rest.Resource
 import grails.rest.render.Renderer
+import grails.spring.BeanBuilder
 import grails.util.GrailsWebMockUtil
 import grails.web.CamelCaseUrlConverter
 import grails.web.mapping.LinkGenerator
@@ -15,13 +16,15 @@ import grails.web.mime.MimeType
 import org.grails.config.PropertySourcesConfig
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext
 import org.grails.datastore.mapping.model.MappingContext
-import org.grails.plugins.web.mime.MimeTypesFactoryBean
+import org.grails.plugins.web.mime.MimeTypesConfiguration
 import org.grails.support.MockApplicationContext
 import org.grails.web.mapping.DefaultLinkGenerator
 import org.grails.web.mapping.DefaultUrlMappingEvaluator
 import org.grails.web.mapping.DefaultUrlMappingsHolder
 import org.grails.web.mime.DefaultMimeUtility
 import org.grails.web.servlet.mvc.GrailsWebRequest
+import org.springframework.context.ApplicationContext
+import org.springframework.context.support.GenericApplicationContext
 import org.springframework.core.env.MapPropertySource
 import org.springframework.core.env.MutablePropertySources
 import org.springframework.mock.web.MockHttpServletRequest
@@ -89,11 +92,19 @@ abstract class BaseDomainClassRendererSpec extends Specification {
         return new PropertySourcesConfig(propertySources)
     }
 
-    protected static MimeType[] buildMimeTypes(application) {
-        def mimeTypesFactory = new MimeTypesFactoryBean()
-        mimeTypesFactory.grailsApplication = application
-        def mimeTypes = mimeTypesFactory.getObject()
-        return mimeTypes
+    private MimeType[] buildMimeTypes(application) {
+        final def mainContext = new GenericApplicationContext()
+        mainContext.refresh()
+        application.setApplicationContext(mainContext)
+
+        def bb = new BeanBuilder()
+        bb.beans {
+            grailsApplication = application
+            mimeConfiguration(MimeTypesConfiguration, application, [])
+        }
+        final ApplicationContext context = bb.createApplicationContext()
+        final MimeTypesConfiguration mimeTypesConfiguration = context.getBean(MimeTypesConfiguration)
+        mimeTypesConfiguration.mimeTypes()
     }
 
     protected static String toCompactXml(String xml) {

grails-plugin-mimetypes/src/test/groovy/org/grails/web/servlet/mvc/RequestAndResponseMimeTypesApiSpec.groovy

@@ -10,6 +10,7 @@ dependencies {
     compileOnly "jakarta.servlet:jakarta.servlet-api"
     testCompileOnly "org.springframework:spring-test"
 
+    compileOnly "org.springframework.boot:spring-boot-autoconfigure"
     api "org.springframework:spring-webmvc"
     api "org.springframework:spring-context-support"
     implementation "com.github.ben-manes.caffeine:caffeine"