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

GH-2754: Add channel-based mapping to RouterSpec

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/2754

For better end-user experience when we have `@Bean` declared for a
channel it is good to have a `MessageChannel` based
`RouterSpec.channelMapping` for possible traceability and code
navigation in the IDE
This commit is contained in:
Artem Bilan
2019-04-04 16:09:00 -04:00
committed by Gary Russell
parent ad7ccb3c9b
commit 063759d045
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-core/src/main/java/org/springframework/integration/dsl/RouterSpec.java
View File

@@ -116,9 +116,9 @@ public final class RouterSpec<K, R extends AbstractMappingMessageRouter>
* @return the router spec.
* @see AbstractMappingMessageRouter#setChannelMapping(String, String)
*/
public RouterSpec<K, R> channelMapping(K key, final String channelName) {
public RouterSpec<K, R> channelMapping(K key, String channelName) {
Assert.notNull(key, "'key' must not be null");
Assert.hasText(channelName, "'channelName' must not be null");
Assert.hasText(channelName, "'channelName' must not be empty");
if (key instanceof String) {
this.handler.setChannelMapping((String) key, channelName);
}
@@ -140,6 +140,26 @@ public final class RouterSpec<K, R extends AbstractMappingMessageRouter>
return _this();
}
/**
* The router mapping configuration based on the provided generic key
* and {@link MessageChannel} bean.
* The {@link MessageChannel} must be instance of {@link NamedComponent}
* for proper target router mapping based on the bean name.
* @param key the key.
* @param channel the {@link MessageChannel} instance to use.
* @return the router spec.
* @see AbstractMappingMessageRouter#setChannelMapping(String, String)
* @since 5.2
*/
public RouterSpec<K, R> channelMapping(K key, final MessageChannel channel) {
Assert.notNull(key, "'key' must not be null");
Assert.notNull(channel, "'channel' must not be null");
Assert.isInstanceOf(NamedComponent.class, channel,
() -> "The routing channel '" + channel + " must be instance of 'NamedComponent'.");
this.mappingProvider.addMapping(key, (NamedComponent) channel);
return _this();
}
/**
* Add a subflow as an alternative to a {@link #channelMapping(Object, String)}.
* {@link #prefix(String)} and {@link #suffix(String)} cannot be used when subflow

7
spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java
View File

@@ -89,7 +89,7 @@ public class RouterTests {
public void testRouter() {
this.beanFactory.containsBean("routeFlow.subFlow#0.channel#0");
int[] payloads = new int[] { 1, 2, 3, 4, 5, 6 };
int[] payloads = { 1, 2, 3, 4, 5, 6 };
for (int payload : payloads) {
this.routerInput.send(new GenericMessage<>(payload));
@@ -124,7 +124,7 @@ public class RouterTests {
@SuppressWarnings("unchecked")
List<Integer> results = (List<Integer>) payload;
assertThat(results.toArray(new Integer[results.size()])).isEqualTo(new Integer[] { 3, 4, 9, 8, 15, 12 });
assertThat(results).containsExactly(3, 4, 9, 8, 15, 12);
}
@Autowired
@@ -606,7 +606,7 @@ public class RouterTests {
public IntegrationFlow routeFlow() {
return IntegrationFlows.from("routerInput")
.<Integer, Boolean>route(p -> p % 2 == 0,
m -> m.channelMapping(true, "evenChannel")
m -> m.channelMapping(true, evenChannel())
.subFlowMapping(false, f ->
f.<Integer>handle((p, h) -> p * 3))
.defaultOutputToParentFlow())
@@ -929,5 +929,4 @@ public class RouterTests {
}
}