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

Adjust BaseIntegrationFlowDefinition.controlBus() deprecation

Browse Source 
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`
This commit is contained in:
Artem Bilan
2024-12-02 13:29:40 -05:00
parent 4f0ac8908b
commit 6c426308f0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(

2
src/reference/antora/modules/ROOT/pages/channel/special-channels.adoc
View File

@@ -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.