Replace removed classes in Spring 6 (#13498)

grails · Apr 30, 2024 · 60c9c4c · 60c9c4c
1 parent 6480aa0
commit 60c9c4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../src/main/groovy/org/grails/spring/beans/factory/OptimizedAutowireCapableBeanFactory.java b/.../src/main/groovy/org/grails/spring/beans/factory/OptimizedAutowireCapableBeanFactory.java
@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.support.CglibSubclassingInstantiationStrategy;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.core.StandardReflectionParameterNameDiscoverer;
 import org.springframework.util.ClassUtils;
 
 import java.beans.PropertyChangeEvent;
@@ -95,7 +95,7 @@ public Object instantiate(RootBeanDefinition beanDefinition, String beanName, Be
             });
         }
 
-        setParameterNameDiscoverer(new LocalVariableTableParameterNameDiscoverer());
+        setParameterNameDiscoverer(new StandardReflectionParameterNameDiscoverer());
         setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
         ignoreDependencyType(Closure.class);
     }

diff --git a/grails-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java b/grails-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
+import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -34,7 +34,7 @@
  * @author Graeme Rocher
  * @since 0.4
  */
-public class TransactionManagerPostProcessor extends InstantiationAwareBeanPostProcessorAdapter implements BeanFactoryAware, PriorityOrdered {
+public class TransactionManagerPostProcessor implements SmartInstantiationAwareBeanPostProcessor, BeanFactoryAware, PriorityOrdered {
     private ConfigurableListableBeanFactory beanFactory;
     private PlatformTransactionManager transactionManager;
     private int order = Ordered.LOWEST_PRECEDENCE;