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

Merge pull request #36539 from garyrussell

Browse Source 
* pr/36539:
  Polish "Add RabbitMQ container forceStop property"
  Add RabbitMQ container forceStop property

Closes gh-36539
This commit is contained in:
Stephane Nicoll
2023-07-26 11:22:52 +02:00
parent e8dd775d1c 54066791f9
commit b8e8b1d483
4 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
View File

@@ -118,6 +118,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
}
factory.setMissingQueuesFatal(configuration.isMissingQueuesFatal());
factory.setDeBatchingEnabled(configuration.isDeBatchingEnabled());
factory.setForceStop(configuration.isForceStop());
ListenerRetry retryConfig = configuration.getRetry();
if (retryConfig.isEnabled()) {
RetryInterceptorBuilder<?, ?> builder = (retryConfig.isStateless()) ? RetryInterceptorBuilder.stateless()

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@@ -734,6 +734,12 @@ public class RabbitProperties {
*/
private boolean deBatchingEnabled = true;
/**
* Whether the container (when stopped) should stop immediately after processing
* the current message or stop after processing all pre-fetched messages.
*/
private boolean forceStop;
/**
* Optional properties for a retry interceptor.
*/
@@ -781,6 +787,14 @@ public class RabbitProperties {
this.deBatchingEnabled = deBatchingEnabled;
}
public boolean isForceStop() {
return this.forceStop;
}
public void setForceStop(boolean forceStop) {
this.forceStop = forceStop;
}
public ListenerRetry getRetry() {
return this.retry;
}

30
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View File

@@ -519,7 +519,8 @@ class RabbitAutoConfigurationTests {
"spring.rabbitmq.listener.simple.defaultRequeueRejected:false",
"spring.rabbitmq.listener.simple.idleEventInterval:5",
"spring.rabbitmq.listener.simple.batchSize:20",
"spring.rabbitmq.listener.simple.missingQueuesFatal:false")
"spring.rabbitmq.listener.simple.missingQueuesFatal:false",
"spring.rabbitmq.listener.simple.force-stop:true")
.run((context) -> {
SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory = context
.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
@@ -531,6 +532,17 @@ class RabbitAutoConfigurationTests {
});
}
@Test
void testSimpleRabbitListenerContainerFactoryWithDefaultForceStop() {
this.contextRunner
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
.run((context) -> {
SimpleRabbitListenerContainerFactory containerFactory = context
.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
assertThat(containerFactory).hasFieldOrPropertyWithValue("forceStop", false);
});
}
@Test
void testDirectRabbitListenerContainerFactoryWithCustomSettings() {
this.contextRunner
@@ -547,7 +559,8 @@ class RabbitAutoConfigurationTests {
"spring.rabbitmq.listener.direct.prefetch:40",
"spring.rabbitmq.listener.direct.defaultRequeueRejected:false",
"spring.rabbitmq.listener.direct.idleEventInterval:5",
"spring.rabbitmq.listener.direct.missingQueuesFatal:true")
"spring.rabbitmq.listener.direct.missingQueuesFatal:true",
"spring.rabbitmq.listener.direct.force-stop:true")
.run((context) -> {
DirectRabbitListenerContainerFactory rabbitListenerContainerFactory = context
.getBean("rabbitListenerContainerFactory", DirectRabbitListenerContainerFactory.class);
@@ -557,6 +570,18 @@ class RabbitAutoConfigurationTests {
});
}
@Test
void testDirectRabbitListenerContainerFactoryWithDefaultForceStop() {
this.contextRunner
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
.withPropertyValues("spring.rabbitmq.listener.type:direct")
.run((context) -> {
DirectRabbitListenerContainerFactory containerFactory = context
.getBean("rabbitListenerContainerFactory", DirectRabbitListenerContainerFactory.class);
assertThat(containerFactory).hasFieldOrPropertyWithValue("forceStop", false);
});
}
@Test
void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
@@ -662,6 +687,7 @@ class RabbitAutoConfigurationTests {
context.getBean("myMessageConverter"));
assertThat(containerFactory).hasFieldOrPropertyWithValue("defaultRequeueRejected", Boolean.FALSE);
assertThat(containerFactory).hasFieldOrPropertyWithValue("idleEventInterval", 5L);
assertThat(containerFactory).hasFieldOrPropertyWithValue("forceStop", true);
Advice[] adviceChain = containerFactory.getAdviceChain();
assertThat(adviceChain).isNotNull();
assertThat(adviceChain).hasSize(1);

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
View File

@@ -322,6 +322,7 @@ class RabbitPropertiesTests {
assertThat(container).hasFieldOrPropertyWithValue("missingQueuesFatal", simple.isMissingQueuesFatal());
assertThat(container).hasFieldOrPropertyWithValue("deBatchingEnabled", simple.isDeBatchingEnabled());
assertThat(container).hasFieldOrPropertyWithValue("consumerBatchEnabled", simple.isConsumerBatchEnabled());
assertThat(container).hasFieldOrPropertyWithValue("forceStop", simple.isForceStop());
}
@Test
@@ -332,6 +333,7 @@ class RabbitPropertiesTests {
assertThat(direct.isAutoStartup()).isEqualTo(container.isAutoStartup());
assertThat(container).hasFieldOrPropertyWithValue("missingQueuesFatal", direct.isMissingQueuesFatal());
assertThat(container).hasFieldOrPropertyWithValue("deBatchingEnabled", direct.isDeBatchingEnabled());
assertThat(container).hasFieldOrPropertyWithValue("forceStop", direct.isForceStop());
}
@Test