Fix LambdaMessageProcessor for Map payload

JIRA: https://jira.spring.io/browse/INT-4478 When we use a `GenericHandler` and an incoming payload is a `Map`, we copy it into both arguments into the `Object` for the payload and `Map` for the headers. This way we lose headers in the target lambda * Check a size of arguments on the target lambda and don't set a payload into the `Map` argument if we have more than 1 arguments **Cherry-pick to 5.0.x**
azizasm · May 31, 2018 · 9a88140 · 9a88140
1 parent af89733
commit 9a88140
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...on-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java b/...on-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java
@@ -100,7 +100,7 @@ public Object processMessage(Message<?> message) {
 				args[i] = message;
 			}
 			else if (Map.class.isAssignableFrom(parameterType)) {
-				if (message.getPayload() instanceof Map) {
+				if (message.getPayload() instanceof Map && this.parameterTypes.length == 1) {
 					args[i] = message.getPayload();
 				}
 				else {

diff --git a/...on-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java b/...on-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java
@@ -299,8 +299,10 @@ public IntegrationFlow httpReactiveInboundChannelAdapterFlow() {
 		public IntegrationFlow sseFlow() {
 			return IntegrationFlows
 					.from(WebFlux.inboundGateway("/sse")
-							.requestMapping(m -> m.produces(MediaType.TEXT_EVENT_STREAM_VALUE)))
-					.handle((p, h) -> Flux.just("foo", "bar", "baz"))
+							.requestMapping(m -> m.produces(MediaType.TEXT_EVENT_STREAM_VALUE))
+							.mappedResponseHeaders("*"))
+					.enrichHeaders(Collections.singletonMap("aHeader", new String[] { "foo", "bar", "baz" }))
+					.handle((p, h) -> Flux.fromArray((String[]) h.get("aHeader")))
 					.get();
 		}