Deprecate OptimizedAutowireCapableBeanFactory

Author: graemerocher

grails-core/src/main/groovy/grails/boot/GrailsApp.groovy

@@ -1,6 +1,5 @@
 package grails.boot
 
-import grails.boot.config.tools.SettingsFile
 import grails.compiler.ast.ClassInjector
 import grails.core.GrailsApplication
 import grails.io.IOUtils
@@ -23,16 +22,12 @@ import org.grails.io.watch.DirectoryWatcher
 import org.grails.io.watch.FileExtensionFileChangeListener
 import org.grails.plugins.BinaryGrailsPlugin
 import org.grails.plugins.support.WatchPattern
-import org.grails.spring.beans.factory.OptimizedAutowireCapableBeanFactory
-import org.springframework.beans.factory.support.DefaultListableBeanFactory
 import org.springframework.boot.SpringApplication
 import org.springframework.context.ConfigurableApplicationContext
-import org.springframework.context.support.GenericApplicationContext
 import org.springframework.core.env.ConfigurableEnvironment
-import org.springframework.util.ReflectionUtils
 
-import java.lang.reflect.Field
 import java.util.concurrent.ConcurrentLinkedQueue
+
 /**
  * Extends the {@link SpringApplication} with reloading behavior and other Grails features
  *
@@ -73,7 +68,6 @@ class GrailsApp extends SpringApplication {
     protected ConfigurableApplicationContext createApplicationContext() {
         ConfigurableApplicationContext applicationContext = super.createApplicationContext()
 
-        applyAutowireByNamePerformanceOptimization(applicationContext)
         if(enableBeanCreationProfiler) {
             def processor = new BeanCreationProfilingPostProcessor()
             applicationContext.getBeanFactory().addBeanPostProcessor(processor)
@@ -82,17 +76,6 @@ class GrailsApp extends SpringApplication {
         return applicationContext
     }
 
-    // SPR-11864 workaround
-    protected void applyAutowireByNamePerformanceOptimization(ConfigurableApplicationContext configurableApplicationContext) {
-        if(configurableApplicationContext instanceof GenericApplicationContext) {
-            Field beanFactoryField = ReflectionUtils.findField(GenericApplicationContext, "beanFactory", DefaultListableBeanFactory)
-            ReflectionUtils.makeAccessible(beanFactoryField)
-
-            def beanFactory = new OptimizedAutowireCapableBeanFactory()
-            ReflectionUtils.setField(beanFactoryField, configurableApplicationContext, beanFactory)
-        }
-    }
-
     @Override
     protected void configureEnvironment(ConfigurableEnvironment environment, String[] args) {
         configurePropertySources(environment, args)

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

@@ -29,7 +29,6 @@ import org.grails.spring.aop.autoproxy.GroovyAwareAspectJAwareAdvisorAutoProxyCr
 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.beans.factory.OptimizedAutowireCapableBeanFactory
 import org.grails.spring.RuntimeSpringConfigUtilities
 import org.grails.core.io.DefaultResourceLocator
 import org.grails.spring.beans.GrailsApplicationAwareBeanPostProcessor
@@ -41,6 +40,7 @@ import grails.core.support.proxy.DefaultProxyHandler
 import org.springframework.beans.factory.config.CustomEditorConfigurer
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean
 import org.springframework.beans.factory.config.YamlProcessor
+import org.springframework.beans.factory.support.DefaultListableBeanFactory
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader
 import org.springframework.boot.yaml.SpringProfileDocumentMatcher
 import org.springframework.context.annotation.AnnotationConfigUtils
@@ -178,7 +178,7 @@ class CoreGrailsPlugin extends Plugin {
         if (event.source instanceof Resource) {
             Resource res = (Resource)event.source
             if(res.filename.endsWith('.xml')) {
-                def xmlBeans = new OptimizedAutowireCapableBeanFactory()
+                def xmlBeans = new DefaultListableBeanFactory()
                 new XmlBeanDefinitionReader(xmlBeans).loadBeanDefinitions(res)
                 for(String beanName in xmlBeans.beanDefinitionNames) {
                     applicationContext.registerBeanDefinition(beanName, xmlBeans.getBeanDefinition(beanName))

grails-core/src/main/groovy/org/grails/spring/beans/factory/OptimizedAutowireCapableBeanFactory.java

@@ -51,6 +51,7 @@
  * @author Graeme Rocher
  * @author Lari Hotari
  */
+@Deprecated
 public class OptimizedAutowireCapableBeanFactory extends DefaultListableBeanFactory {
 
     public static boolean DISABLE_AUTOWIRE_BY_NAME_OPTIMIZATIONS = Boolean.getBoolean("grails.disable.optimization.autowirebyname");

grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy

@@ -113,10 +113,10 @@ class GrailsApplicationTestPlugin implements TestPlugin {
         ConfigurableApplicationContext context
 
         if(isServletApiPresent && servletContext != null) {
-            context = (ConfigurableApplicationContext)ClassUtils.forName("org.springframework.web.context.support.GenericWebApplicationContext").newInstance( new OptimizedAutowireCapableBeanFactory(), servletContext);
+            context = (ConfigurableApplicationContext)ClassUtils.forName("org.springframework.web.context.support.GenericWebApplicationContext").newInstance( servletContext);
         }
         else {
-            context = (ConfigurableApplicationContext)ClassUtils.forName("org.springframework.context.support.GenericApplicationContext").newInstance( new OptimizedAutowireCapableBeanFactory());
+            context = (ConfigurableApplicationContext)ClassUtils.forName("org.springframework.context.support.GenericApplicationContext").newInstance();
         }
 
 

grails-test-suite-uber/src/test/groovy/org/grails/commons/spring/OptimizedAutowireCapableBeanFactorySpec.groovy

@@ -22,7 +22,6 @@
 
 import grails.core.GrailsApplication;
 import grails.web.servlet.context.support.GrailsEnvironment;
-import org.grails.spring.beans.factory.OptimizedAutowireCapableBeanFactory;
 import org.grails.spring.GrailsApplicationContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -59,7 +58,7 @@ public class GrailsWebApplicationContext extends GrailsApplicationContext
     private GrailsApplication grailsApplication;
 
     public GrailsWebApplicationContext() throws BeansException {
-        super(new OptimizedAutowireCapableBeanFactory());
+        super();
     }
 
     public GrailsWebApplicationContext(GrailsApplication grailsApplication) {
@@ -68,7 +67,7 @@ public GrailsWebApplicationContext(GrailsApplication grailsApplication) {
     }
 
     public GrailsWebApplicationContext(ApplicationContext parent) throws BeansException {
-        this(new OptimizedAutowireCapableBeanFactory(), parent);
+        super(parent);
     }
 
     public GrailsWebApplicationContext(DefaultListableBeanFactory defaultListableBeanFactory, GrailsApplication grailsApplication) {