Merge branch '3.1.x' into 3.2.x

Closes gh-39078

Author: mhalbritter

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

@@ -47,6 +47,7 @@
  * @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 StreamContainer getStream() {
 
 	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 abstract static class AmqpContainer extends BaseContainer {
 		 */
 		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;
 		}