diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
index 1bc7a1703b3..04eb584d5f3 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -16,8 +16,7 @@
package org.springframework.integration.amqp.config;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.springframework.amqp.core.AcknowledgeMode;
import org.springframework.amqp.core.Message;
@@ -37,10 +36,10 @@
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Mark Fisher
@@ -49,8 +48,7 @@
*
* @since 2.1
*/
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringJUnitConfig
@DirtiesContext
public class AmqpInboundChannelAdapterParserTests {
@@ -71,6 +69,8 @@ public void verifyIdAsChannel() {
.isInstanceOf(SimpleMessageListenerContainer.class);
assertThat(TestUtils.getPropertyValue(adapter, "batchMode", BatchMode.class))
.isEqualTo(BatchMode.EXTRACT_PAYLOADS);
+ assertThat(TestUtils.getPropertyValue(adapter, "messageListenerContainer.batchSize", Integer.class))
+ .isEqualTo(2);
}
@Test
@@ -95,6 +95,8 @@ public void verifyLifeCycle() {
.isEqualTo(AcknowledgeMode.NONE);
assertThat(TestUtils.getPropertyValue(adapter, "messageListenerContainer.missingQueuesFatal", Boolean.class))
.isFalse();
+ assertThat(TestUtils.getPropertyValue(adapter, "messageListenerContainer.batchSize", Integer.class))
+ .isEqualTo(3);
}
@Test
@@ -216,14 +218,13 @@ public void withHeaderMapperDefaultMapping() throws Exception {
@Test
public void testInt2971HeaderMapperAndMappedHeadersExclusivity() {
- try {
- new ClassPathXmlApplicationContext("AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml",
- this.getClass()).close();
- }
- catch (BeanDefinitionParsingException e) {
- assertThat(e.getMessage().startsWith("Configuration problem: The 'header-mapper' attribute " +
- "is mutually exclusive with 'mapped-request-headers' or 'mapped-reply-headers'")).isTrue();
- }
+ assertThatExceptionOfType(BeanDefinitionParsingException.class)
+ .isThrownBy(() ->
+ new ClassPathXmlApplicationContext(
+ "AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml",
+ getClass()))
+ .withMessageStartingWith("Configuration problem: The 'header-mapper' attribute " +
+ "is mutually exclusive with 'mapped-request-headers' or 'mapped-reply-headers'");
}
}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
index 911101139b4..59629ab4f1d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
@@ -282,7 +282,7 @@ public void setMinimumTimeoutForEmptyGroups(long minimumTimeoutForEmptyGroups) {
*/
public void setReleasePartialSequences(boolean releasePartialSequences) {
if (!this.releaseStrategySet && releasePartialSequences) {
- setReleaseStrategy(new SequenceSizeReleaseStrategy());
+ setReleaseStrategy(new SequenceSizeReleaseStrategy(releasePartialSequences));
}
this.releasePartialSequences = releasePartialSequences;
}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
index fd0ed2475ee..deb126142f1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2024 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.
@@ -27,6 +27,7 @@
import org.springframework.integration.handler.DiscardingMessageHandler;
import org.springframework.integration.handler.MessageTriggerAction;
import org.springframework.integration.store.SimpleMessageGroup;
+import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandlingException;
@@ -170,7 +171,8 @@ public BarrierMessageHandler(long requestTimeout, long triggerTimeout, MessageGr
}
/**
- * Set the name of the channel to which late arriving trigger messages are sent.
+ * Set the name of the channel to which late arriving trigger messages are sent,
+ * or request message does not arrive in time.
* @param discardChannelName the discard channel.
* @since 5.0
*/
@@ -179,7 +181,8 @@ public void setDiscardChannelName(String discardChannelName) {
}
/**
- * Set the channel to which late arriving trigger messages are sent.
+ * Set the channel to which late arriving trigger messages are sent,
+ * or request message does not arrive in time.
* @param discardChannel the discard channel.
* @since 5.0
*/
@@ -188,8 +191,11 @@ public void setDiscardChannel(MessageChannel discardChannel) {
}
/**
+ * Return the discard message channel for trigger action message.
+ * @return a discard message channel.
* @since 5.0
*/
+ @Nullable
@Override
public MessageChannel getDiscardChannel() {
String channelName = this.discardChannelName;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
index 2ddc0c0d241..a46824b2def 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
@@ -30,6 +30,7 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import org.springframework.beans.factory.BeanFactory;
@@ -59,6 +60,7 @@
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.ErrorMessage;
import org.springframework.messaging.support.InterceptableChannel;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -335,12 +337,22 @@ else if (this.metricsCaptor != null) {
private boolean sendWithObservation(Message message, long timeout) {
MutableMessage messageToSend = MutableMessage.of(message);
- return IntegrationObservation.PRODUCER.observation(
- this.observationConvention,
- DefaultMessageSenderObservationConvention.INSTANCE,
- () -> new MessageSenderContext(messageToSend, getComponentName()),
- this.observationRegistry)
- .observe(() -> sendInternal(messageToSend, timeout)); // NOSONAR - never null
+ Observation observation = IntegrationObservation.PRODUCER.observation(
+ this.observationConvention,
+ DefaultMessageSenderObservationConvention.INSTANCE,
+ () -> new MessageSenderContext(messageToSend, getComponentName()),
+ this.observationRegistry);
+ Boolean observe = observation.observe(() -> {
+ Message messageToSendInternal = messageToSend;
+ if (message instanceof ErrorMessage errorMessage) {
+ messageToSendInternal =
+ new ErrorMessage(errorMessage.getPayload(),
+ messageToSend.getHeaders(),
+ errorMessage.getOriginalMessage());
+ }
+ return sendInternal(messageToSendInternal, timeout);
+ });
+ return Boolean.TRUE.equals(observe);
}
private boolean sendWithMetrics(Message message, long timeout) {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java
index 01de10f5b23..13c1bbca54a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-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.
@@ -17,6 +17,8 @@
package org.springframework.integration.channel;
import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
@@ -28,10 +30,9 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;
-import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
import reactor.util.context.ContextView;
+import org.springframework.context.Lifecycle;
import org.springframework.core.log.LogMessage;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.StaticMessageHeaderAccessor;
@@ -44,6 +45,9 @@
/**
* The {@link AbstractMessageChannel} implementation for the
* Reactive Streams {@link Publisher} based on the Project Reactor {@link Flux}.
+ *
+ * This class implements {@link Lifecycle} to control subscriptions to publishers
+ * attached via {@link #subscribeTo(Publisher)}, when this channel is restarted.
*
* @author Artem Bilan
* @author Gary Russell
@@ -52,15 +56,13 @@
* @since 5.0
*/
public class FluxMessageChannel extends AbstractMessageChannel
- implements Publisher>, ReactiveStreamsSubscribableChannel {
-
- private final Scheduler scheduler = Schedulers.boundedElastic();
+ implements Publisher>, ReactiveStreamsSubscribableChannel, Lifecycle {
private final Sinks.Many> sink = Sinks.many().multicast().onBackpressureBuffer(1, false);
- private final Sinks.Many subscribedSignal = Sinks.many().replay().limit(1);
+ private final List>> sourcePublishers = new ArrayList<>();
- private final Disposable.Composite upstreamSubscriptions = Disposables.composite();
+ private volatile Disposable.Composite upstreamSubscriptions = Disposables.composite();
private volatile boolean active = true;
@@ -92,47 +94,47 @@ private boolean tryEmitMessage(Message message) {
.setHeader(IntegrationMessageHeaderAccessor.REACTOR_CONTEXT, contextView)
.build();
}
- return switch (this.sink.tryEmitNext(messageToEmit)) {
- case OK -> true;
- case FAIL_NON_SERIALIZED, FAIL_OVERFLOW -> false;
- case FAIL_ZERO_SUBSCRIBER ->
- throw new IllegalStateException("The [" + this + "] doesn't have subscribers to accept messages");
- case FAIL_TERMINATED, FAIL_CANCELLED ->
- throw new IllegalStateException("Cannot emit messages into the cancelled or terminated sink: "
- + this.sink);
- };
+
+ if (this.active) {
+ return switch (this.sink.tryEmitNext(messageToEmit)) {
+ case OK -> true;
+ case FAIL_NON_SERIALIZED, FAIL_OVERFLOW -> false;
+ case FAIL_ZERO_SUBSCRIBER ->
+ throw new IllegalStateException("The [" + this + "] doesn't have subscribers to accept messages");
+ case FAIL_TERMINATED, FAIL_CANCELLED ->
+ throw new IllegalStateException("Cannot emit messages into the cancelled or terminated sink: "
+ + this.sink);
+ };
+ }
+ else {
+ return false;
+ }
}
@Override
public void subscribe(Subscriber> subscriber) {
this.sink.asFlux()
- .doFinally((s) -> this.subscribedSignal.tryEmitNext(this.sink.currentSubscriberCount() > 0))
- .share()
+ .publish(1)
+ .refCount()
.subscribe(subscriber);
-
- Mono subscribersBarrier =
- Mono.fromCallable(() -> this.sink.currentSubscriberCount() > 0)
- .filter(Boolean::booleanValue)
- .doOnNext(this.subscribedSignal::tryEmitNext)
- .repeatWhenEmpty((repeat) ->
- this.active ? repeat.delayElements(Duration.ofMillis(100)) : repeat); // NOSONAR
-
- addPublisherToSubscribe(Flux.from(subscribersBarrier));
}
- private void addPublisherToSubscribe(Flux publisher) {
- AtomicReference disposableReference = new AtomicReference<>();
+ @Override
+ public void start() {
+ this.active = true;
+ this.upstreamSubscriptions = Disposables.composite();
+ this.sourcePublishers.forEach(this::doSubscribeTo);
+ }
- Disposable disposable =
- publisher
- .doOnTerminate(() -> disposeUpstreamSubscription(disposableReference))
- .subscribe();
+ @Override
+ public void stop() {
+ this.active = false;
+ this.upstreamSubscriptions.dispose();
+ }
- if (!disposable.isDisposed()) {
- if (this.upstreamSubscriptions.add(disposable)) {
- disposableReference.set(disposable);
- }
- }
+ @Override
+ public boolean isRunning() {
+ return this.active;
}
private void disposeUpstreamSubscription(AtomicReference disposableReference) {
@@ -145,10 +147,19 @@ private void disposeUpstreamSubscription(AtomicReference disposableR
@Override
public void subscribeTo(Publisher> publisher) {
+ this.sourcePublishers.add(publisher);
+ doSubscribeTo(publisher);
+ }
+
+ private void doSubscribeTo(Publisher> publisher) {
Flux