Polish "Support additional publisher confirm types"

See gh-17848

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

@@ -87,18 +87,13 @@ public class RabbitProperties {
 	@DurationUnit(ChronoUnit.SECONDS)
 	private Duration requestedHeartbeat;
 
-	/**
-	 * Whether to enable publisher confirms.
-	 */
-	private boolean publisherConfirms;
-
 	/**
 	 * Whether to enable publisher returns.
 	 */
 	private boolean publisherReturns;
 
 	/**
-	 * The type of publisher confirms to use.
+	 * Type of publisher confirms to use.
 	 */
 	private ConfirmType publisherConfirmType;
 
@@ -280,17 +275,15 @@ public class RabbitProperties {
 		this.requestedHeartbeat = requestedHeartbeat;
 	}
 
+	@DeprecatedConfigurationProperty(reason = "replaced to support additional confirm types",
+			replacement = "spring.rabbitmq.publisher-confirm-type")
 	public boolean isPublisherConfirms() {
 		return this.publisherConfirmType.equals(ConfirmType.CORRELATED);
 	}
 
 	@Deprecated
 	public void setPublisherConfirms(boolean publisherConfirms) {
-		if (publisherConfirms) {
+		this.publisherConfirmType = (publisherConfirms) ? ConfirmType.CORRELATED : ConfirmType.NONE;
-			this.publisherConfirmType = ConfirmType.CORRELATED;
-			return;
-		}
-		this.publisherConfirmType = ConfirmType.NONE;
 	}
 
 	public boolean isPublisherReturns() {

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

@@ -80,6 +80,7 @@ import static org.mockito.Mockito.verify;
  * @author Greg Turnquist
  * @author Stephane Nicoll
  * @author Gary Russell
+ * @author HaiTao Zhang
  */
 class RabbitAutoConfigurationTests {