[dubbo] branch 3.2 updated: Replace InstantiationAwareBeanPostProcessorAdapter with InstantiationAwareBeanPostProcessor (#10697)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new d2cea7b998 Replace InstantiationAwareBeanPostProcessorAdapter with 
InstantiationAwareBeanPostProcessor (#10697)
d2cea7b998 is described below

commit d2cea7b9988a5689e78a80294a8273ec2dae6eb7
Author: diguage <leejun...@gmail.com>
AuthorDate: Sat Oct 8 09:12:44 2022 +0800

    Replace InstantiationAwareBeanPostProcessorAdapter with 
InstantiationAwareBeanPostProcessor (#10697)
---
 .../AbstractAnnotationBeanPostProcessor.java       | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
index 381c6df0af..31d7db105c 100644
--- 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.InjectionMetadata;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import 
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import 
org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
+import 
org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import 
org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Bean;
@@ -61,8 +61,8 @@ import static 
org.springframework.core.BridgeMethodResolver.isVisibilityBridgeMe
  * Abstract common {@link BeanPostProcessor} implementation for customized 
annotation that annotated injected-object.
  */
 @SuppressWarnings("unchecked")
-public abstract class AbstractAnnotationBeanPostProcessor extends
-        InstantiationAwareBeanPostProcessorAdapter implements 
MergedBeanDefinitionPostProcessor,
+public abstract class AbstractAnnotationBeanPostProcessor implements
+        InstantiationAwareBeanPostProcessor, MergedBeanDefinitionPostProcessor,
         BeanFactoryAware, BeanClassLoaderAware, EnvironmentAware, 
DisposableBean {
 
     private final static int CACHE_SIZE = Integer.getInteger("", 32);
@@ -311,6 +311,26 @@ public abstract class AbstractAnnotationBeanPostProcessor 
extends
     protected abstract Object doGetInjectedBean(AnnotationAttributes 
attributes, Object bean, String beanName, Class<?> injectedType,
                                                 AnnotatedInjectElement 
injectedElement) throws Exception;
 
+    @Override
+    public Object postProcessBeforeInstantiation(Class<?> beanClass, String 
beanName) throws BeansException {
+        return null;
+    }
+
+    @Override
+    public boolean postProcessAfterInstantiation(Object bean, String beanName) 
throws BeansException {
+        return true;
+    }
+
+    @Override
+    public Object postProcessBeforeInitialization(Object bean, String 
beanName) throws BeansException {
+        return bean;
+    }
+
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) 
throws BeansException {
+        return bean;
+    }
+
     /**
      * {@link Annotation Annotated} {@link InjectionMetadata} implementation
      */