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

Add convenient IntegrationFlowDefinition.bridge()

Browse Source 
To avoid confusing `.bridge(null)` in the end of flow for replying to the gateway on top introduce simple `.bridge()` with just delegation to the `.bridge(null)` with the same result as before
This commit is contained in:
Artem Bilan
2017-02-02 18:18:10 -05:00
parent d8cbcd1310
commit e06c0e2927
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
View File

@@ -210,7 +210,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
public B channel(MessageChannel messageChannel) {
Assert.notNull(messageChannel, "'messageChannel' must not be null");
if (this.currentMessageChannel != null) {
bridge(null);
bridge();
}
this.currentMessageChannel = messageChannel;
return registerOutputChannelIfCan(this.currentMessageChannel);
@@ -1102,7 +1102,16 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
*/
public <H extends MessageHandler> B handle(H messageHandler, Consumer<GenericEndpointSpec<H>> endpointConfigurer) {
Assert.notNull(messageHandler, "'messageHandler' must not be null");
return this.register(new GenericEndpointSpec<H>(messageHandler), endpointConfigurer);
return this.register(new GenericEndpointSpec<>(messageHandler), endpointConfigurer);
}
/**
* Populate a {@link BridgeHandler} to the current integration flow position.
* @return the current {@link IntegrationFlowDefinition}.
* @see #bridge(Consumer)
*/
public B bridge() {
return bridge(null);
}
/**
@@ -1120,7 +1129,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
* @see GenericEndpointSpec
*/
public B bridge(Consumer<GenericEndpointSpec<BridgeHandler>> endpointConfigurer) {
return this.register(new GenericEndpointSpec<BridgeHandler>(new BridgeHandler()), endpointConfigurer);
return register(new GenericEndpointSpec<>(new BridgeHandler()), endpointConfigurer);
}
/**
@@ -1191,7 +1200,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
Assert.notNull(enricherConfigurer, "'enricherConfigurer' must not be null");
EnricherSpec enricherSpec = new EnricherSpec();
enricherConfigurer.accept(enricherSpec);
return this.handle(enricherSpec.get(), endpointConfigurer);
return handle(enricherSpec.get(), endpointConfigurer);
}
/**

2
spring-integration-core/src/test/java/org/springframework/integration/dsl/flowservices/FlowServiceTests.java
View File

@@ -119,7 +119,7 @@ public class FlowServiceTests {
public IntegrationFlow testGateway() {
return f -> f.gateway("processChannel", g -> g.replyChannel("replyChannel"))
.log()
.bridge(null);
.bridge();
}
@Bean

4
spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java
View File

@@ -136,7 +136,7 @@ public class ManualFlowTests {
@Override
public void configure(IntegrationFlowDefinition<?> flow) {
flow.bridge(null);
flow.bridge();
}
}
@@ -283,7 +283,7 @@ public class ManualFlowTests {
@Bean
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public IntegrationFlow wrongScopeFlow() {
return flow -> flow.bridge(null);
return IntegrationFlowDefinition::bridge;
}
}