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

INT-3648: Fix AMAPProcessor and DefICAParser

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3648
This commit is contained in:
Artem Bilan
2015-02-20 13:22:55 +02:00
committed by Gary Russell
parent 04b7e6541b
commit 95e38fe2d1
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
((Advised) handler).addAdvisor(advisor);
}
else {
ProxyFactory proxyFactory = new ProxyFactory(bean);
ProxyFactory proxyFactory = new ProxyFactory(handler);
proxyFactory.addAdvisor(advisor);
handler = (MessageHandler) proxyFactory.getProxy(this.beanFactory.getBeanClassLoader());
}

4
spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
result = this.parseMethodInvokingSource(innnerBeanDef, methodName, element, parserContext);
}
else {
result = innnerBeanDef;
result = innnerBeanDef.getBeanDefinition();
}
}
else if (hasScriptElement) {

5
spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-inner-context.xml
View File

@@ -16,4 +16,9 @@
<beans:bean class="org.springframework.integration.config.ChannelAdapterParserTests$SampleBean"/>
</inbound-channel-adapter>
<inbound-channel-adapter id="messageSourceRef" channel="queueChannel" auto-startup="false">
<poller max-messages-per-poll="1" fixed-delay="10000"/>
<beans:bean class="org.springframework.integration.config.ChannelAdapterParserTests$TestSource"/>
</inbound-channel-adapter>
</beans:beans>

32
spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.integration.config;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -25,7 +26,6 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -55,6 +55,7 @@ import org.springframework.messaging.support.GenericMessage;
public class ChannelAdapterParserTests {
private AbstractApplicationContext applicationContext;
private AbstractApplicationContext applicationContextInner;
@@ -129,8 +130,8 @@ public class ChannelAdapterParserTests {
fail("MessageDispatchingException is expected.");
}
catch (Exception e) {
assertThat(e, Matchers.instanceOf(MessageDeliveryException.class));
assertThat(e.getCause(), Matchers.instanceOf(MessageDispatchingException.class));
assertThat(e, instanceOf(MessageDeliveryException.class));
assertThat(e.getCause(), instanceOf(MessageDispatchingException.class));
}
((EventDrivenConsumer) adapter).start();
@@ -279,7 +280,7 @@ public class ChannelAdapterParserTests {
@Test(expected = BeanDefinitionParsingException.class)
public void innerBeanAndExpressionFail() throws Exception {
new ClassPathXmlApplicationContext("InboundChannelAdapterInnerBeanWithExpression-fail-context.xml", this.getClass()).close();;
new ClassPathXmlApplicationContext("InboundChannelAdapterInnerBeanWithExpression-fail-context.xml", this.getClass()).close();
}
@Test
@@ -311,12 +312,29 @@ public class ChannelAdapterParserTests {
assertSame(testMessageSource, source);
}
@Test
public void testMessageSourceAsInnerBean() {
MessageSource<?> bean = this.applicationContextInner.getBean("messageSourceRef.source", MessageSource.class);
assertThat(bean, instanceOf(TestSource.class));
}
public static class SampleBean {
private final String message = "hello";
String getMessage() {
return message;
}
}
}
}
public static class TestSource implements MessageSource<Object> {
@Override
public Message<Object> receive() {
return null;
}
}
}