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

Optimize MessageTriggerAction for Java DSL (#8595)

Browse Source 
Currently, the `MessageTriggerAction.trigger` is configured
on the `BaseIntegrationFlowDefinition` to be called via reflection
in the `MessagingMethodInvokerHelper`

* Represent a `MessageTriggerAction.trigger` as a `Consumer<Message<?>>` method reference
and use a `LambdaMessageProcessor` for direct call
* Add a `Consumer` support for `LambdaMessageProcessor`
This commit is contained in:
Artem Bilan
2023-04-13 12:56:45 -04:00
committed by GitHub
parent b99729544d
commit aaaa489f0c
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
View File

@@ -187,8 +187,8 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
*/
protected InterceptableChannel currentInterceptableChannel() {
MessageChannel currentChannel = getCurrentMessageChannel();
if (currentChannel instanceof InterceptableChannel) {
return (InterceptableChannel) currentChannel;
if (currentChannel instanceof InterceptableChannel interceptableChannel) {
return interceptableChannel;
}
else {
DirectChannel newCurrentChannel = new DirectChannel();
@@ -1161,7 +1161,7 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
* @see GenericEndpointSpec
*/
public B bridge(Consumer<GenericEndpointSpec<BridgeHandler>> endpointConfigurer) {
return register(new GenericEndpointSpec<>(new BridgeHandler()), endpointConfigurer);
return handle(new BridgeHandler(), endpointConfigurer);
}
/**
@@ -2836,7 +2836,9 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
public B trigger(MessageTriggerAction triggerAction,
Consumer<GenericEndpointSpec<ServiceActivatingHandler>> endpointConfigurer) {
return handle(new ServiceActivatingHandler(triggerAction, "trigger"), endpointConfigurer);
Consumer<Message<?>> trigger = triggerAction::trigger;
return handle(new ServiceActivatingHandler(new LambdaMessageProcessor(trigger, Message.class)),
endpointConfigurer);
}
/**

12
spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2022 the original author or authors.
* Copyright 2016-2023 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.
@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
import org.apache.commons.logging.Log;
@@ -98,7 +99,8 @@ public class LambdaMessageProcessor implements MessageProcessor<Object>, BeanFac
}
private static boolean isExplicit(Object target) {
return target instanceof Function<?, ?> ||
return target instanceof Consumer<?> ||
target instanceof Function<?, ?> ||
target instanceof GenericHandler<?> ||
target instanceof GenericSelector<?> ||
target instanceof GenericTransformer<?, ?>;
@@ -189,7 +191,11 @@ public class LambdaMessageProcessor implements MessageProcessor<Object>, BeanFac
@SuppressWarnings({"unchecked", "rawtypes"})
private Object invokeMethod(Object[] args) throws InvocationTargetException, IllegalAccessException {
if (this.target instanceof Function function) {
if (this.target instanceof Consumer consumer) {
consumer.accept(args[0]);
return null;
}
else if (this.target instanceof Function function) {
return function.apply(args[0]);
}
else if (this.target instanceof GenericSelector selector) {