Merge branch '3.2.x'

Closes gh-39079
This commit is contained in:
Moritz Halbritter 2024-01-10 09:58:24 +01:00
commit d610955b9d

View File

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