diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index 80a304a448..57df4f7f69 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -249,7 +249,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa protected abstract Object handleRequestMessage(Message requestMessage); - private interface RequestHandler { + public interface RequestHandler { Object handleRequestMessage(Message requestMessage); diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java index b9f7b91949..dc23e12eee 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java @@ -59,7 +59,7 @@ public abstract class AbstractJpaOutboundGatewayParser extends AbstractConsumerE BeanDefinition txAdviceDefinition = IntegrationNamespaceUtils.configureTransactionAttributes(transactionalElement); ManagedList adviceChain = new ManagedList(); adviceChain.add(txAdviceDefinition); - jpaOutboundGatewayBuilder.addPropertyValue("adviceChain", adviceChain); + jpaOutboundGatewayBuilder.addPropertyValue("txAdviceChain", adviceChain); } return jpaOutboundGatewayBuilder; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java index 6bd1758a64..ac331ff70a 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java @@ -18,10 +18,12 @@ import static org.junit.Assert.assertTrue; import org.junit.After; import org.junit.Test; +import org.springframework.aop.support.AopUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; import org.springframework.integration.channel.AbstractMessageChannel; +import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jpa.core.JpaExecutor; @@ -36,6 +38,7 @@ import org.springframework.integration.test.util.TestUtils; * @author Gunnar Hillert * @author Amol Nayak * @author Gary Russell + * @author Artem Bilan * @since 2.2 * */ @@ -134,10 +137,11 @@ public class JpaOutboundGatewayParserTests { @Test public void advised() throws Exception { - setUp("JpaOutboundGatewayParserTests.xml", getClass(), "updatingJpaOutboundGateway"); + setUp("JpaOutboundGatewayParserTests.xml", getClass(), "advised"); + + MessageHandler jpaOutboundGateway = context.getBean("advised.handler", MessageHandler.class); + assertTrue(AopUtils.isAopProxy(jpaOutboundGateway)); - EventDrivenConsumer consumer = this.context.getBean("advised", EventDrivenConsumer.class); - final JpaOutboundGateway jpaOutboundGateway = TestUtils.getPropertyValue(consumer, "handler", JpaOutboundGateway.class); jpaOutboundGateway.handleMessage(new GenericMessage("foo")); assertEquals(1, adviceCalled); } diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.xml b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.xml index 9cffc8b0cc..2a468fc56e 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.xml +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.xml @@ -46,8 +46,9 @@ request-channel="in" reply-channel="out" reply-timeout="100"> + - +