natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inject reference bean from spring instead of ref object (#5454)

This commit is contained in:
GungnirLaevatain 2020-02-06 17:16:33 +08:00 committed by GitHub
parent ee77776296
commit 027c5a6c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
View File

@ -139,7 +139,7 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
cacheInjectedReferenceBean(referenceBean, injectedElement);
return getOrCreateProxy(referencedBeanName, referenceBeanName, referenceBean, injectedType);
return getOrCreateProxy(referencedBeanName, referenceBeanName, attributes, injectedType);
}
/**
@ -232,21 +232,25 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
*
* @param referencedBeanName The name of bean that annotated Dubbo's {@link Service @Service} in the Spring {@link ApplicationContext}
* @param referenceBeanName the bean name of {@link ReferenceBean}
* @param referenceBean the instance of {@link ReferenceBean}
* @param attributes the {@link AnnotationAttributes attributes} of {@link Reference @Reference}
* @param serviceInterfaceType the type of Dubbo service interface
* @return non-null
* @since 2.7.4
*/
private Object getOrCreateProxy(String referencedBeanName, String referenceBeanName, ReferenceBean referenceBean, Class<?> serviceInterfaceType) {
if (existsServiceBean(referencedBeanName)) { // If the local @Service Bean exists, build a proxy of ReferenceBean
private Object getOrCreateProxy(String referencedBeanName, String referenceBeanName, AnnotationAttributes attributes, Class<?> serviceInterfaceType) {
String beanName = getReferenceBeanName(attributes, serviceInterfaceType);
ConfigurableListableBeanFactory beanFactory = getBeanFactory();
// Get remote or local @Service Bean
Object bean = beanFactory.getBean(beanName);
if (existsServiceBean(referencedBeanName)) {
// If the local @Service Bean exists, build a proxy of ReferenceBean
return newProxyInstance(getClassLoader(), new Class[]{serviceInterfaceType},
wrapInvocationHandler(referenceBeanName, referenceBean));
} else { // ReferenceBean should be initialized and get immediately
/**
* TODO, if we can make sure this happens after {@link DubboLifecycleComponentApplicationListener},
* TODO, then we can avoid starting bootstrap in here, because bootstrap should has been started.
*/
return referenceBean.get();
wrapInvocationHandler(referenceBeanName, bean));
} else {
return bean;
}
}
@ -259,29 +263,23 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
* @return non-null
* @since 2.7.4
*/
private InvocationHandler wrapInvocationHandler(String referenceBeanName, ReferenceBean referenceBean) {
private InvocationHandler wrapInvocationHandler(String referenceBeanName, Object referenceBean) {
return localReferenceBeanInvocationHandlerCache.computeIfAbsent(referenceBeanName, name ->
new ReferenceBeanInvocationHandler(referenceBean));
}
private static class ReferenceBeanInvocationHandler implements InvocationHandler {
private final ReferenceBean referenceBean;
private Object bean;
private ReferenceBeanInvocationHandler(ReferenceBean referenceBean) {
this.referenceBean = referenceBean;
private ReferenceBeanInvocationHandler(Object bean) {
this.bean = bean;
}
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
Object result;
try {
if (bean == null) { // If the bean is not initialized, invoke init()
// issue: https://github.com/apache/dubbo/issues/3429
init();
}
result = method.invoke(bean, args);
} catch (InvocationTargetException e) {
// re-throws the actual Exception.
@ -289,10 +287,6 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
}
return result;
}
private void init() {
this.bean = referenceBean.get();
}
}
@Override
@ -361,11 +355,7 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
private void initReferenceBeanInvocationHandler(ServiceBean serviceBean) {
String serviceBeanName = serviceBean.getBeanName();
// Remove ServiceBean when it's exported
ReferenceBeanInvocationHandler handler = localReferenceBeanInvocationHandlerCache.remove(serviceBeanName);
// Initialize
if (handler != null) {
handler.init();
}
localReferenceBeanInvocationHandlerCache.remove(serviceBeanName);
}