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

GH-3953: Use lazy-load for output channels

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

The replying `MessageHandler` can resolve the target output channel in on-demand manner.
A new messaging annotations on `@Bean` parsing algorithm is missing the lazy-load
opportunity and uses a `RuntimeBeanReference` for output channel options
loading its bean eagerly.

* Fix `AbstractMethodAnnotationPostProcessor` to use a `outputChannelName` and
`defaultOutputChannelName` target properties for channel names to set.
This commit is contained in:
abilan
2022-11-28 14:12:12 -05:00
committed by Gary Russell
parent 90797aa969
commit dc6f5aa004
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java
View File

@@ -211,8 +211,8 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
new BeanDefinitionPropertiesMapper(handlerBeanDefinition, annotations)
.setPropertyValue(SEND_TIMEOUT_ATTRIBUTE)
.setPropertyReference("outputChannel")
.setPropertyReference("defaultOutputChannel");
.setPropertyValue("outputChannel", "outputChannelName")
.setPropertyValue("defaultOutputChannel", "defaultOutputChannelName");
}
if (isClassIn(handlerBeanClass, AbstractMessageProducingHandler.class,

35
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationsWithBeanAnnotationTests.java
View File

@@ -47,6 +47,7 @@ import org.springframework.integration.aggregator.ExpressionEvaluatingCorrelatio
import org.springframework.integration.aggregator.ExpressionEvaluatingReleaseStrategy;
import org.springframework.integration.annotation.BridgeFrom;
import org.springframework.integration.annotation.BridgeTo;
import org.springframework.integration.annotation.EndpointId;
import org.springframework.integration.annotation.Filter;
import org.springframework.integration.annotation.InboundChannelAdapter;
import org.springframework.integration.annotation.Poller;
@@ -63,6 +64,7 @@ import org.springframework.integration.config.EnableMessageHistory;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageSelector;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
@@ -70,7 +72,10 @@ import org.springframework.integration.filter.ExpressionEvaluatingSelector;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.splitter.DefaultMessageSplitter;
import org.springframework.integration.store.MessageGroup;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.transformer.ExpressionEvaluatingTransformer;
import org.springframework.integration.transformer.MessageTransformingHandler;
import org.springframework.integration.transformer.ObjectToMapTransformer;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
@@ -151,6 +156,10 @@ public class MessagingAnnotationsWithBeanAnnotationTests {
@Autowired
private CountDownLatch reactiveCustomizerLatch;
@Autowired
@Qualifier("objectToMapEndpoint.handler")
private MessageTransformingHandler objectToMapTransformerHandler;
@Test
public void testMessagingAnnotationsFlow() throws InterruptedException {
Stream.of(this.sourcePollingChannelAdapters).forEach(AbstractEndpoint::start);
@@ -253,6 +262,18 @@ public class MessagingAnnotationsWithBeanAnnotationTests {
.verifyComplete();
}
@Test
public void outputChannelIsLazyLoaded() {
assertThat(TestUtils.getPropertyValue(this.objectToMapTransformerHandler, "outputChannelName"))
.isEqualTo("lazilyCreatedChannel");
assertThat(TestUtils.getPropertyValue(this.objectToMapTransformerHandler, "outputChannel")).isNull();
assertThat(this.objectToMapTransformerHandler.getOutputChannel())
.isInstanceOf(DirectChannel.class)
.extracting("beanName")
.isEqualTo("lazilyCreatedChannel");
}
@Configuration
@EnableIntegration
@@ -460,6 +481,20 @@ public class MessagingAnnotationsWithBeanAnnotationTests {
};
}
@Bean
@Transformer(inputChannel = "toMapChannel", outputChannel = "lazilyCreatedChannel")
@EndpointId("objectToMapEndpoint")
public ObjectToMapTransformer objectToMapTransformer() {
return new ObjectToMapTransformer();
}
@Bean
public IntegrationFlow lazyChannelFlow() {
return IntegrationFlow.from("lazilyCreatedChannel")
.log()
.nullChannel();
}
}
@Configuration