From 83441e862e465ff58c7f89a046bd3c8352e0672e Mon Sep 17 00:00:00 2001 From: stvort Date: Thu, 27 Jul 2023 16:26:50 +0400 Subject: [PATCH] 2023-03 spring-30-endpoints-flow-components updated --- .../integration/config/IntegrationConfig.java | 19 +++++++------------ .../otus/spring/test/gateway/GatewayApp.java | 4 +++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java b/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java index 5bfb760a..a2890f86 100644 --- a/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java +++ b/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java @@ -2,13 +2,8 @@ package ru.otus.spring.integration.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.MessageChannels; -import org.springframework.integration.dsl.Pollers; +import org.springframework.integration.dsl.*; import org.springframework.integration.scheduling.PollerMetadata; - import ru.otus.spring.integration.domain.Food; import ru.otus.spring.integration.services.KitchenService; @@ -16,18 +11,18 @@ import ru.otus.spring.integration.services.KitchenService; public class IntegrationConfig { @Bean - public QueueChannel itemsChannel() { - return MessageChannels.queue(10).get(); + public MessageChannelSpec itemsChannel() { + return MessageChannels.queue(10); } @Bean - public PublishSubscribeChannel foodChannel() { - return MessageChannels.publishSubscribe().get(); + public MessageChannelSpec foodChannel() { + return MessageChannels.publishSubscribe(); } @Bean(name = PollerMetadata.DEFAULT_POLLER) - public PollerMetadata poller() { - return Pollers.fixedRate(100).maxMessagesPerPoll(2).get(); + public PollerSpec poller() { + return Pollers.fixedRate(100).maxMessagesPerPoll(2); } @Bean diff --git a/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/test/gateway/GatewayApp.java b/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/test/gateway/GatewayApp.java index 9b4402c5..309e5cf1 100644 --- a/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/test/gateway/GatewayApp.java +++ b/2023-03/spring-30-endpoints-flow-components/endpoints-flow-components-solution/src/main/java/ru/otus/spring/test/gateway/GatewayApp.java @@ -51,11 +51,13 @@ public class GatewayApp { @Bean public IntegrationFlow upcase() { - return f -> f + return f -> f//.channel("from-input-to-split") .split() // .split(list -> list.get().spliterator()) // .split(getCustomSplitter(), "split") +// .channel("from-split-to-transformer") .transform(String::toUpperCase) +// .channel("from-transformer-to-aggregate") .aggregate(); }