Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IdempotentReceiverAutoProxyCreatorInit refinement

Browse Source 
No reason to load class one more time if `MethodMetadata` is already `StandardMethodMetadata`

See https://jira.spring.io/browse/SPR-14505

**Cherry-pick to 4.3.x**
This commit is contained in:
Artem Bilan
2016-12-24 16:04:13 -05:00
parent f3460bdec7
commit 1e46fb84f3
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java
View File

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.core.type.MethodMetadata; import org.springframework.core.type.MethodMetadata;
import org.springframework.core.type.StandardMethodMetadata;
import org.springframework.integration.annotation.IdempotentReceiver; import org.springframework.integration.annotation.IdempotentReceiver;
import org.springframework.integration.handler.advice.IdempotentReceiverInterceptor; import org.springframework.integration.handler.advice.IdempotentReceiverInterceptor;
import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandler;
@@ -81,17 +82,24 @@ public class IdempotentReceiverAutoProxyCreatorInitializer implements Integratio
if (beanMethod.isAnnotated(annotationType)) { if (beanMethod.isAnnotated(annotationType)) {
Object value = beanMethod.getAnnotationAttributes(annotationType).get("value"); Object value = beanMethod.getAnnotationAttributes(annotationType).get("value");
if (value != null) { if (value != null) {
String[] interceptors = (String[]) value;
String endpoint = beanName;
Class<?> returnType; Class<?> returnType;
try { if (beanMethod instanceof StandardMethodMetadata) {
returnType = ClassUtils.forName(beanMethod.getReturnTypeName(), returnType = ((StandardMethodMetadata) beanMethod).getIntrospectedMethod()
beanFactory.getBeanClassLoader()); .getReturnType();
} }
catch (ClassNotFoundException e) { else {
throw new CannotLoadBeanClassException(beanDefinition.getDescription(), try {
beanName, beanMethod.getReturnTypeName(), e); returnType = ClassUtils.forName(beanMethod.getReturnTypeName(),
beanFactory.getBeanClassLoader());
}
catch (ClassNotFoundException e) {
throw new CannotLoadBeanClassException(beanDefinition.getDescription(),
beanName, beanMethod.getReturnTypeName(), e);
}
} }
String endpoint = beanName;
if (!MessageHandler.class.isAssignableFrom(returnType)) { if (!MessageHandler.class.isAssignableFrom(returnType)) {
/* /*
MessageHandler beans, populated from @Bean methods, have a complex id, MessageHandler beans, populated from @Bean methods, have a complex id,
@@ -101,6 +109,8 @@ public class IdempotentReceiverAutoProxyCreatorInitializer implements Integratio
endpoint = beanDefinition.getFactoryBeanName() + "." + beanName + endpoint = beanDefinition.getFactoryBeanName() + "." + beanName +
".*" + IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX; ".*" + IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX;
} }
String[] interceptors = (String[]) value;
for (String interceptor : interceptors) { for (String interceptor : interceptors) {
Map<String, String> idempotentEndpoint = new ManagedMap<String, String>(); Map<String, String> idempotentEndpoint = new ManagedMap<String, String>();
idempotentEndpoint.put(interceptor, endpoint); idempotentEndpoint.put(interceptor, endpoint);