From f2b88b4c6a5bc35eaebdd338de58905aa29daa4e Mon Sep 17 00:00:00 2001
From: abilan <abilan@vmware.com>
Date: Fri, 17 Mar 2023 14:52:41 -0400
Subject: [PATCH] Fix sonar smell in the MessagingGatewaySupport

---
 .../integration/gateway/MessagingGatewaySupport.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
index 112ff0ae92..d439e6c1da 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
@@ -589,19 +589,18 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
 		}
 	}
 
+	@Nullable
 	private Message<?> sendAndReceiveWithObservation(MessageChannel requestChannel, Object object,
 			Message<?> requestMessage) {
 
-		MessageRequestReplyReceiverContext context =
-				new MessageRequestReplyReceiverContext(requestMessage, getComponentName());
-
 		return IntegrationObservation.GATEWAY.observation(this.observationConvention,
 						DefaultMessageRequestReplyReceiverObservationConvention.INSTANCE,
-						() -> context, this.observationRegistry)
-				.observe(() -> {
+						() -> new MessageRequestReplyReceiverContext(requestMessage, getComponentName()),
+						this.observationRegistry)
+				.<MessageRequestReplyReceiverContext, Message<?>>observeWithContext((ctx) -> {
 					Message<?> replyMessage = doSendAndReceive(requestChannel, object, requestMessage);
 					if (replyMessage != null) {
-						context.setResponse(replyMessage);
+						ctx.setResponse(replyMessage);
 					}
 					return replyMessage;
 				});