From 89f79482c377d061c9c728ecc34dd3304fdb71bc Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Wed, 26 Feb 2025 16:19:14 -0500
Subject: [PATCH] GH-9863: Deprecate `PollerMetadata.sendTimeout` option

Fixes: #9863
Issue link: https://github.com/spring-projects/spring-integration/issues/9863

The `PollerMetadata.sendTimeout` has been migrated to the `SourcePollingChannelAdapter.setSendTimeout()` long time ago.
Right now this option is not propagated anywhere

* Introduce missed `SourcePollingChannelAdapterSpec.sendTimeout`
* Deprecate (for removal) `PollerMetadata.sendTimeout`
* Verify `SourcePollingChannelAdapterSpec.sendTimeout` option in the `ReactiveStreamsTests`

(cherry picked from commit 0af3b25cd6a632f674d7d1344db1b7b68e40e822)

# Conflicts:
#	spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java
---
 .../springframework/integration/dsl/PollerSpec.java | 10 ++++++++--
 .../dsl/SourcePollingChannelAdapterSpec.java        | 13 ++++++++++++-
 .../integration/scheduling/PollerMetadata.java      |  4 +++-
 .../dsl/reactivestreams/ReactiveStreamsTests.java   |  5 ++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java
index efbcf020dd..7d3a3dee12 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2025 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.
@@ -189,8 +189,14 @@ public final class PollerSpec extends IntegrationComponentSpec<PollerSpec, Polle
 		return this;
 	}
 
+	/**
+	 * The timeout for blocking send on channels.
+	 * @param sendTimeout the timeout to use.
+	 * @return the spec.
+	 * @deprecated in favor of {@link SourcePollingChannelAdapterSpec#sendTimeout(long)}
+	 */
+	@Deprecated(forRemoval = true, since = "6.3.9")
 	public PollerSpec sendTimeout(long sendTimeout) {
-		this.target.setSendTimeout(sendTimeout);
 		return this;
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java
index 594cf4641f..6a05a800bf 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-2025 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.
@@ -60,4 +60,15 @@ public class SourcePollingChannelAdapterSpec extends
 		return this;
 	}
 
+	/**
+	 * The timeout for blocking send on channels.
+	 * @param sendTimeout the timeout to use.
+	 * @return the spec.
+	 * @since 6.3.9
+	 */
+	public SourcePollingChannelAdapterSpec sendTimeout(long sendTimeout) {
+		this.endpointFactoryBean.setSendTimeout(sendTimeout);
+		return this;
+	}
+
 }
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
index 8ef87bb7a5..84b26ad6e1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -138,10 +138,12 @@ public class PollerMetadata {
 		return this.taskExecutor;
 	}
 
+	@Deprecated(forRemoval = true, since = "6.3.9")
 	public long getSendTimeout() {
 		return this.sendTimeout;
 	}
 
+	@Deprecated(forRemoval = true, since = "6.3.9")
 	public void setSendTimeout(long sendTimeout) {
 		this.sendTimeout = sendTimeout;
 	}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java
index ee98ade390..24cd97399b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 the original author or authors.
+ * Copyright 2016-2025 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.
@@ -52,6 +52,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.endpoint.ReactiveMessageSourceProducer;
 import org.springframework.integration.endpoint.ReactiveStreamsConsumer;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.GenericMessage;
@@ -122,6 +123,7 @@ public class ReactiveStreamsTests {
 
 		disposable.dispose();
 		assertThat(this.messageSource.isRunning()).isFalse();
+		assertThat(TestUtils.getPropertyValue(this.messageSource, "messagingTemplate.sendTimeout")).isEqualTo(256L);
 	}
 
 	@Test
@@ -275,6 +277,7 @@ public class ReactiveStreamsTests {
 			return IntegrationFlow
 					.from(() -> new GenericMessage<>("a,b,c,d,e,f"),
 							e -> e.poller(p -> p.trigger(ctx -> this.invoked.getAndSet(true) ? null : Instant.now()))
+									.sendTimeout(256)
 									.id("reactiveStreamsMessageSource"))
 					.split(String.class, p -> p.split(","))
 					.log()