Merge branch '3.1.x' into 3.2.x

Closes gh-39078
This commit is contained in:
Moritz Halbritter
2024-01-10 09:53:45 +01:00

View File

@@ -47,6 +47,7 @@ import org.springframework.util.unit.DataSize;
* @author Eddú Meléndez
* @author Rafael Carvalho
* @author Scott Frederick
* @author Lasse Wulff
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.rabbitmq")
@@ -718,23 +719,15 @@ public class RabbitProperties {
public abstract static class BaseContainer {
}
public abstract static class AmqpContainer extends BaseContainer {
/**
* Whether to start the container automatically on startup.
*/
private boolean autoStartup = true;
public boolean isAutoStartup() {
return this.autoStartup;
}
public void setAutoStartup(boolean autoStartup) {
this.autoStartup = autoStartup;
}
}
public abstract static class AmqpContainer extends BaseContainer {
/**
* Acknowledge mode of container.
*/
@@ -773,6 +766,14 @@ public class RabbitProperties {
*/
private final ListenerRetry retry = new ListenerRetry();
public boolean isAutoStartup() {
return this.autoStartup;
}
public void setAutoStartup(boolean autoStartup) {
this.autoStartup = autoStartup;
}
public AcknowledgeMode getAcknowledgeMode() {
return this.acknowledgeMode;
}