From 6c426308f0f16f118c7aa022183e4fe9a4041cd9 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Mon, 2 Dec 2024 13:29:40 -0500
Subject: [PATCH] Adjust `BaseIntegrationFlowDefinition.controlBus()`
 deprecation

Related to: https://github.com/spring-projects/spring-integration/issues/9683.

Since we are going to restore `controlBus()` for convenience,
and only one way of Control Bus pattern, based on the `ControlBusCommandRegistry`, there is no need to have another `controlBusOnRegistry()` method

* Also fix link for `error-handling` chapter from the `special-channels.adoc`
---
 .../integration/dsl/BaseIntegrationFlowDefinition.java    | 8 ++++----
 .../modules/ROOT/pages/channel/special-channels.adoc      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
index 449bdb6dd1..fdfdbd7a2a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
@@ -541,9 +541,9 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
 	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
 	 * at the current {@link IntegrationFlow} chain position.
 	 * @return the current {@link BaseIntegrationFlowDefinition}.
-	 * @deprecated in favor of {@link #controlBusOnRegistry()}
+	 * @deprecated in favor of {@link #controlBusOnRegistry()} - will be restored in next version.
 	 */
-	@Deprecated(since = "6.4", forRemoval = true)
+	@Deprecated(since = "6.4")
 	public B controlBus() {
 		return controlBus(null);
 	}
@@ -553,10 +553,10 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
 	 * at the current {@link IntegrationFlow} chain position.
 	 * @param endpointConfigurer the {@link Consumer} to accept integration endpoint options.
 	 * @return the current {@link BaseIntegrationFlowDefinition}.
-	 * @deprecated in favor of {@link #controlBusOnRegistry(Consumer)}
+	 * @deprecated in favor of {@link #controlBusOnRegistry(Consumer)} - will be restored in next version.
 	 * @see GenericEndpointSpec
 	 */
-	@Deprecated(since = "6.4", forRemoval = true)
+	@Deprecated(since = "6.4")
 	@SuppressWarnings("removal")
 	public B controlBus(@Nullable Consumer<GenericEndpointSpec<ServiceActivatingHandler>> endpointConfigurer) {
 		return handle(new ServiceActivatingHandler(
diff --git a/src/reference/antora/modules/ROOT/pages/channel/special-channels.adoc b/src/reference/antora/modules/ROOT/pages/channel/special-channels.adoc
index 45fc6d000d..fa52e54141 100644
--- a/src/reference/antora/modules/ROOT/pages/channel/special-channels.adoc
+++ b/src/reference/antora/modules/ROOT/pages/channel/special-channels.adoc
@@ -10,7 +10,7 @@ If there is need to do anything with such an error, the `xref:handler-advice/rea
 Any time you face channel resolution errors for a reply that you do not care about, you can set the affected component's `output-channel` attribute to 'nullChannel' (the name, 'nullChannel', is reserved within the application context).
 
 The 'errorChannel' is used internally for sending error messages and may be overridden with a custom configuration.
-This is discussed in greater detail in xref:scatter-gather.adoc#scatter-gather-error-handling[Error Handling].
+This is discussed in greater detail in xref:error-handling.adoc[Error Handling].
 
 
 See also xref:dsl/java-channels.adoc[Message Channels] in the Java DSL chapter for more information about message channel and interceptors.