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

Post merge polishing

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4363

* Register `HandlerMethodArgumentResolver`s in the
`IntegrationRegistrar` as `BeanDefinition`s to let them be configured by
the `BeanFactory` callback.
The direct instance doesn't call callbacks
* Use `JacksonPresent` in the `IntegrationRegistrar` instead of local
property
* Some code style polishing for the `IntegrationRegistrar`
* Add `JsonPathTests.testJsonPathOnPayloadAnnotation()` to ensure
that `PayloadExpressionArgumentResolver` is properly configured by the
`BeanFactory` and `#jsonPath()` SpEL-function is properly evaluated on
the `@Payload` for method `@ServiceActivator` method argument
This commit is contained in:
Artem Bilan
2017-11-15 14:00:50 -05:00
parent 986d5fc0cd
commit 9414ceef86
6 changed files with 152 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2016 the original author or authors.
* Copyright 2013-2017 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.
@@ -39,10 +39,15 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.integration.MessageRejectedException;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -56,6 +61,7 @@ import com.jayway.jsonpath.Predicate;
/**
* @author Artem Bilan
* @author Gary Russell
*
* @since 3.0
*/
@ContextConfiguration(classes = JsonPathTests.JsonPathTestsContextConfiguration.class,
@@ -207,9 +213,28 @@ public class JsonPathTests {
assertNull(this.routerOutput1.receive(10));
}
@Autowired
private MessageChannel jsonPathMessageChannel;
@Test
public void testJsonPathOnPayloadAnnotation() {
QueueChannel replyChannel = new QueueChannel();
Message<String> message = MessageBuilder.withPayload(JSON)
.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
.build();
this.jsonPathMessageChannel.send(message);
Message<?> receive = replyChannel.receive(10_000);
assertNotNull(receive);
assertEquals("Nigel Rees", receive.getPayload());
}
@Configuration
@ImportResource("classpath:org/springframework/integration/json/JsonPathTests-context.xml")
@EnableIntegration
public static class JsonPathTestsContextConfiguration {
@Bean
@@ -217,6 +242,11 @@ public class JsonPathTests {
return Filter.filter(Criteria.where("isbn").exists(true).and("category").ne("fiction"));
}
@ServiceActivator(inputChannel = "jsonPathMessageChannel")
public String handle(@Payload("#jsonPath(#root, '$.store.book[0].author')") String payload) {
return payload;
}
}
}