fix to gh-17828

Author: htztomic

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

@@ -101,6 +101,9 @@ public CachingConnectionFactory rabbitConnectionFactory(RabbitProperties propert
 			map.from(properties::determineAddresses).to(factory::setAddresses);
 			map.from(properties::isPublisherConfirms).to(factory::setPublisherConfirms);
 			map.from(properties::isPublisherReturns).to(factory::setPublisherReturns);
+			if (!properties.isPublisherConfirms()) {
+				map.from(properties::isSimplePublisherConfirms).to(factory::setSimplePublisherConfirms);
+			}
 			RabbitProperties.Cache.Channel channel = properties.getCache().getChannel();
 			map.from(channel::getSize).whenNonNull().to(factory::setChannelCacheSize);
 			map.from(channel::getCheckoutTimeout).whenNonNull().as(Duration::toMillis)

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

@@ -96,6 +96,11 @@ public class RabbitProperties {
 	 */
 	private boolean publisherReturns;
 
+	/**
+	 * Whether to enable simple publisher confirms.
+	 */
+	private boolean simplePublisherConfirms;
+
 	/**
 	 * Connection timeout. Set it to zero to wait forever.
 	 */
@@ -290,6 +295,14 @@ public void setPublisherReturns(boolean publisherReturns) {
 		this.publisherReturns = publisherReturns;
 	}
 
+	public void setSimplePublisherConfirms(boolean simplePublisherConfirms) {
+		this.simplePublisherConfirms = simplePublisherConfirms;
+	}
+
+	public boolean isSimplePublisherConfirms() {
+		return this.simplePublisherConfirms;
+	}
+
 	public Duration getConnectionTimeout() {
 		return this.connectionTimeout;
 	}

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

@@ -210,6 +210,20 @@ void testConnectionFactoryPublisherSettings() {
 				});
 	}
 
+	@Test
+	void testConnectionFactorySimplePublisherSettings() {
+		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+				.withPropertyValues("spring.rabbitmq.simple-publisher-confirms=true",
+						"spring.rabbitmq.publisher-returns=true")
+				.run((context) -> {
+					CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
+					RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
+					assertThat(connectionFactory.isSimplePublisherConfirms()).isTrue();
+					assertThat(connectionFactory.isPublisherReturns()).isTrue();
+					assertThat(getMandatory(rabbitTemplate)).isTrue();
+				});
+	}
+
 	@Test
 	void testRabbitTemplateMessageConverters() {
 		this.contextRunner.withUserConfiguration(MessageConvertersConfiguration.class).run((context) -> {