Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatible with Springframework 6 removed class InstantiationAwareBeanPostProcessorAdapter (#10953) #10954

Closed
wants to merge 2 commits into from
Closed

Compatible with Springframework 6 removed class InstantiationAwareBeanPostProcessorAdapter (#10953) #10954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b521b
Compatible with Spring Framework 6. Remove class InstantiationAwareBe…
gitchenjh Nov 18, 2022
e99e118
Compatible with Spring Boot 3 AutoConfiguration.imports
gitchenjh Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions ...che/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
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;
Expand Down Expand Up @@ -61,8 +61,8 @@
* 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);
Expand Down Expand Up @@ -120,6 +120,26 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
}

@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;
}

/**
* Finds {@link InjectionMetadata.InjectedElement} Metadata from annotated fields
*
Expand Down
1 change: 1 addition & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration
3 changes: 3 additions & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBinding2AutoConfiguration
org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBindingAutoConfiguration
org.apache.dubbo.spring.boot.autoconfigure.DubboListenerAutoConfiguration
3 changes: 3 additions & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
3 changes: 3 additions & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration
org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBindingAutoConfiguration
org.apache.dubbo.spring.boot.autoconfigure.DubboListenerAutoConfiguration