root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Rename JMS listener minimum concurrency property 

This commit renames `spring.jms.listener.concurrency` property to
`spring.jms.listener.min-concurrency` in order to better align it with
`spring.jms.listener.max-concurrency`.

See gh-37451
This commit is contained in:
Vedran Pavic 2023-09-18 21:18:40 +02:00 committed by Moritz Halbritter
parent 2015046a69
commit 433bd337f4
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.jms;
import java.time.Duration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* Configuration properties for JMS.
@ -148,7 +149,7 @@ public class JmsProperties {
/**
* Minimum number of concurrent consumers.
*/
private Integer concurrency;
private Integer minConcurrency;
/**
* Maximum number of concurrent consumers.
@ -178,12 +179,23 @@ public class JmsProperties {
this.acknowledgeMode = acknowledgeMode;
}
@DeprecatedConfigurationProperty(replacement = "spring.jms.listener.min-concurrency", since = "3.2.0")
@Deprecated(since = "3.2.0", forRemoval = true)
public Integer getConcurrency() {
return this.concurrency;
return this.minConcurrency;
}
@Deprecated(since = "3.2.0", forRemoval = true)
public void setConcurrency(Integer concurrency) {
this.concurrency = concurrency;
this.minConcurrency = concurrency;
}
public Integer getMinConcurrency() {
return this.minConcurrency;
}
public void setMinConcurrency(Integer minConcurrency) {
this.minConcurrency = minConcurrency;
}
public Integer getMaxConcurrency() {
@ -195,11 +207,11 @@ public class JmsProperties {
}
public String formatConcurrency() {
if (this.concurrency == null) {
if (this.minConcurrency == null) {
return (this.maxConcurrency != null) ? "1-" + this.maxConcurrency : null;
}
return ((this.maxConcurrency != null) ? this.concurrency + "-" + this.maxConcurrency
: String.valueOf(this.concurrency));
return ((this.maxConcurrency != null) ? this.minConcurrency + "-" + this.maxConcurrency
: String.valueOf(this.minConcurrency));
}
public Duration getReceiveTimeout() {

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
View File

@ -143,7 +143,7 @@ class JmsAutoConfigurationTests {
void testJmsListenerContainerFactoryWithCustomSettings() {
this.contextRunner.withUserConfiguration(EnableJmsConfiguration.class)
.withPropertyValues("spring.jms.listener.autoStartup=false", "spring.jms.listener.acknowledgeMode=client",
"spring.jms.listener.concurrency=2", "spring.jms.listener.receiveTimeout=2s",
"spring.jms.listener.minConcurrency=2", "spring.jms.listener.receiveTimeout=2s",
"spring.jms.listener.maxConcurrency=10")
.run(this::testJmsListenerContainerFactoryWithCustomSettings);
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsPropertiesTests.java
View File

@ -40,7 +40,7 @@ class JmsPropertiesTests {
@Test
void formatConcurrencyOnlyLowerBound() {
JmsProperties properties = new JmsProperties();
properties.getListener().setConcurrency(2);
properties.getListener().setMinConcurrency(2);
assertThat(properties.getListener().formatConcurrency()).isEqualTo("2");
}
@ -54,7 +54,7 @@ class JmsPropertiesTests {
@Test
void formatConcurrencyBothBounds() {
JmsProperties properties = new JmsProperties();
properties.getListener().setConcurrency(2);
properties.getListener().setMinConcurrency(2);
properties.getListener().setMaxConcurrency(10);
assertThat(properties.getListener().formatConcurrency()).isEqualTo("2-10");
}