Introduce high-level API for flows composition (#3624)
* Introduce high-level API for flows composition
For better end-user experience and more smooth integration logic
decomposition and distribution introduce an `IntegrationFlows.from(IntegrationFlow)`
to let to start the current flow from existing one.
On the other hand introduce an `BaseIntegrationFlowDefinition.to(IntegrationFlow)`
to let to continue the flow logic in the other existing one.
This way we can extract some templating logic into separate `IntegrationFlow` definitions
allowing at the same time to decompose a complex flow definition into logical reusable parts
* * Add more tests
* * Fix Checkstyle violation
* Add `@SuppressWarnings("overloads")` to new `from(IntegrationFlow)` and existing `from(Publisher)`.
Technically it does not make sense since `PublisherIntegrationFlow` is not a `public` class
* * Add docs
* Fix language in JavaDocs according review
* Fix language in the docs after review
Co-authored-by: Gary Russell <grussell@vmware.com>
Co-authored-by: Gary Russell <grussell@vmware.com>
This commit is contained in:
@@ -0,0 +1,213 @@
|
||||
/*
|
||||
* Copyright 2021 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.dsl.composition;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.BeanCreationException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.integration.channel.DirectChannel;
|
||||
import org.springframework.integration.channel.QueueChannel;
|
||||
import org.springframework.integration.config.EnableIntegration;
|
||||
import org.springframework.integration.dsl.IntegrationFlow;
|
||||
import org.springframework.integration.dsl.IntegrationFlows;
|
||||
import org.springframework.integration.dsl.Pollers;
|
||||
import org.springframework.integration.dsl.context.IntegrationFlowContext;
|
||||
import org.springframework.integration.scheduling.PollerMetadata;
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.support.GenericMessage;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
|
||||
|
||||
/**
|
||||
* @author Artem Bilan
|
||||
*
|
||||
* @since 5.5.4
|
||||
*/
|
||||
@SpringJUnitConfig
|
||||
@DirtiesContext
|
||||
public class IntegrationFlowCompositionTests {
|
||||
|
||||
@Autowired
|
||||
IntegrationFlowContext integrationFlowContext;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("mainFlow.input")
|
||||
DirectChannel mainFlowInput;
|
||||
|
||||
@Autowired
|
||||
QueueChannel otherFlowResultChannel;
|
||||
|
||||
@Test
|
||||
void testToOperator() {
|
||||
this.mainFlowInput.send(new GenericMessage<>("hello"));
|
||||
Message<?> receive = this.otherFlowResultChannel.receive(10_000);
|
||||
assertThat(receive).isNotNull()
|
||||
.extracting(Message::getPayload)
|
||||
.isEqualTo("HELLO from other flow");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
@Qualifier("requestReplyMainFlow.input")
|
||||
DirectChannel requestReplyMainFlowInput;
|
||||
|
||||
@Test
|
||||
void testToWithRequestReply() {
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
this.requestReplyMainFlowInput.send(
|
||||
MessageBuilder.withPayload("TEST")
|
||||
.setReplyChannel(replyChannel)
|
||||
.build());
|
||||
Message<?> receive = replyChannel.receive(10_000);
|
||||
assertThat(receive).isNotNull()
|
||||
.extracting(Message::getPayload)
|
||||
.isEqualTo("Reply for: test");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
QueueChannel compositionMainFlowResult;
|
||||
|
||||
@Test
|
||||
void testFromComposition() {
|
||||
Message<?> receive = this.compositionMainFlowResult.receive(10_000);
|
||||
assertThat(receive).isNotNull()
|
||||
.extracting(Message::getPayload)
|
||||
.isEqualTo("TEST DATA");
|
||||
|
||||
receive = this.compositionMainFlowResult.receive(10_000);
|
||||
assertThat(receive).isNotNull()
|
||||
.extracting(Message::getPayload)
|
||||
.isEqualTo("TEST DATA");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
@Qualifier("firstFlow.input")
|
||||
DirectChannel firstFlowInput;
|
||||
|
||||
@Autowired
|
||||
QueueChannel lastFlowResult;
|
||||
|
||||
@Test
|
||||
void testFromToComposition() {
|
||||
this.firstFlowInput.send(new GenericMessage<>("start"));
|
||||
|
||||
Message<?> receive = this.lastFlowResult.receive(10_000);
|
||||
assertThat(receive).isNotNull()
|
||||
.extracting(Message::getPayload)
|
||||
.isEqualTo("start, and first flow, and middle flow, and last flow");
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidStartFlowForComposition() {
|
||||
IntegrationFlow startFlow = f -> f.handle(m -> { });
|
||||
|
||||
assertThatIllegalArgumentException()
|
||||
.isThrownBy(() -> IntegrationFlows.from(startFlow))
|
||||
.withMessageContaining("must be declared as a bean in the application context");
|
||||
|
||||
IntegrationFlowContext.IntegrationFlowRegistration startRegistration =
|
||||
this.integrationFlowContext.registration(startFlow).register();
|
||||
|
||||
assertThatExceptionOfType(BeanCreationException.class)
|
||||
.isThrownBy(() -> IntegrationFlows.from(startRegistration.getIntegrationFlow()))
|
||||
.withMessageContaining("The 'IntegrationFlow' to start from must end with " +
|
||||
"a 'MessageChannel' or reply-producing endpoint");
|
||||
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@EnableIntegration
|
||||
public static class ContextConfiguration {
|
||||
|
||||
@Bean(PollerMetadata.DEFAULT_POLLER)
|
||||
PollerMetadata defaultPoller() {
|
||||
return Pollers.fixedDelay(100).get();
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow mainFlow(IntegrationFlow otherFlow) {
|
||||
return f -> f
|
||||
.<String, String>transform(String::toUpperCase)
|
||||
.to(otherFlow);
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow otherFlow() {
|
||||
return f -> f
|
||||
.<String, String>transform(p -> p + " from other flow")
|
||||
.channel(c -> c.queue("otherFlowResultChannel"));
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow requestReplyMainFlow(IntegrationFlow templateFlow) {
|
||||
return f -> f
|
||||
.<String, String>transform(String::toLowerCase)
|
||||
.to(templateFlow);
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow templateFlow() {
|
||||
return f -> f
|
||||
.<String, String>transform("Reply for: "::concat);
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow templateSourceFlow() {
|
||||
return IntegrationFlows.fromSupplier(() -> "test data")
|
||||
.channel("sourceChannel")
|
||||
.get();
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow compositionMainFlow(IntegrationFlow templateSourceFlow) {
|
||||
return IntegrationFlows.from(templateSourceFlow)
|
||||
.<String, String>transform(String::toUpperCase)
|
||||
.channel(c -> c.queue("compositionMainFlowResult"))
|
||||
.get();
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow firstFlow() {
|
||||
return f -> f
|
||||
.<String, String>transform(p -> p + ", and first flow");
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow middleFlow(IntegrationFlow firstFlow, IntegrationFlow lastFlow) {
|
||||
return IntegrationFlows.from(firstFlow)
|
||||
.<String, String>transform(p -> p + ", and middle flow")
|
||||
.to(lastFlow);
|
||||
}
|
||||
|
||||
@Bean
|
||||
IntegrationFlow lastFlow() {
|
||||
return f -> f
|
||||
.<String, String>transform(p -> p + ", and last flow")
|
||||
.channel(c -> c.queue("lastFlowResult"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user