diff --git a/build.gradle b/build.gradle index 660fbfa8..0d978335 100644 --- a/build.gradle +++ b/build.gradle @@ -197,7 +197,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' springIntegrationVersion = '4.3.1.RELEASE' - springIntegrationDslVersion = '1.2.0.M1' + springIntegrationDslVersion = '1.2.0.M2' springIntegrationKafkaVersion = '2.0.1.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '1.1.0.M1' diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index b19e6ae4..5fc97deb 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -87,7 +87,7 @@ public class Application { .split(Order.class, Order::getItems) .channel(c -> c.executor(Executors.newCachedThreadPool())) .route(OrderItem::isIced, mapping -> mapping - .subFlowMapping("true", sf -> sf + .subFlowMapping(true, sf -> sf .channel(c -> c.queue(10)) .publishSubscribeChannel(c -> c .subscribe(s -> s.handle(m -> Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS))) @@ -97,7 +97,7 @@ public class Application { + " prepared cold drink #" + this.coldDrinkCounter.incrementAndGet() + " for order #" + p.getOrderNumber() + ": " + p) .handle(m -> System.out.println(m.getPayload()))))) - .subFlowMapping("false", sf -> sf + .subFlowMapping(false, sf -> sf .channel(c -> c.queue(10)) .publishSubscribeChannel(c -> c .subscribe(s -> s.handle(m -> Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS))) @@ -106,7 +106,8 @@ public class Application { Thread.currentThread().getName() + " prepared hot drink #" + this.hotDrinkCounter.incrementAndGet() + " for order #" + p.getOrderNumber() + ": " + p) - .handle(m -> System.out.println(m.getPayload())))))) + .handle(m -> System.out.println(m.getPayload()))))) + .defaultOutputToParentFlow()) .transform(orderItem -> new Drink(orderItem.getOrderNumber(), orderItem.getDrinkType(),