Rename maxAttempts to maxRetries

Closes gh-48023

Author: snicoll

core/spring-boot/src/main/java/org/springframework/boot/retry/RetryPolicySettings.java

@@ -39,7 +39,7 @@ public final class RetryPolicySettings {
 	/**
 	 * Default number of retry attempts.
 	 */
-	public static final long DEFAULT_MAX_ATTEMPTS = RetryPolicy.Builder.DEFAULT_MAX_ATTEMPTS;
+	public static final long DEFAULT_MAX_RETRIES = RetryPolicy.Builder.DEFAULT_MAX_RETRIES;
 
 	/**
 	 * Default initial delay.
@@ -62,7 +62,7 @@ public final class RetryPolicySettings {
 
 	private @Nullable Predicate<Throwable> exceptionPredicate;
 
-	private Long maxAttempts = DEFAULT_MAX_ATTEMPTS;
+	private Long maxRetries = DEFAULT_MAX_RETRIES;
 
 	private Duration delay = DEFAULT_DELAY;
 
@@ -84,7 +84,7 @@ public RetryPolicy createRetryPolicy() {
 		map.from(this::getExceptionIncludes).to(builder::includes);
 		map.from(this::getExceptionExcludes).to(builder::excludes);
 		map.from(this::getExceptionPredicate).to(builder::predicate);
-		map.from(this::getMaxAttempts).to(builder::maxAttempts);
+		map.from(this::getMaxRetries).to(builder::maxRetries);
 		map.from(this::getDelay).to(builder::delay);
 		map.from(this::getJitter).to(builder::jitter);
 		map.from(this::getMultiplier).to(builder::multiplier);
@@ -153,18 +153,19 @@ public void setExceptionPredicate(@Nullable Predicate<Throwable> exceptionPredic
 	/**
 	 * Return the maximum number of retry attempts.
 	 * @return the maximum number of retry attempts
-	 * @see #DEFAULT_MAX_ATTEMPTS
+	 * @see #DEFAULT_MAX_RETRIES
 	 */
-	public Long getMaxAttempts() {
-		return this.maxAttempts;
+	public Long getMaxRetries() {
+		return this.maxRetries;
 	}
 
 	/**
 	 * Specify the maximum number of retry attempts.
-	 * @param maxAttempts the max attempts (must be equal or greater than zero)
+	 * @param maxRetries the maximum number of retry attempts (must be equal or greater
+	 * than zero)
 	 */
-	public void setMaxAttempts(Long maxAttempts) {
-		this.maxAttempts = maxAttempts;
+	public void setMaxRetries(Long maxRetries) {
+		this.maxRetries = maxRetries;
 	}
 
 	/**

core/spring-boot/src/test/java/org/springframework/boot/retry/RetryPolicySettingsTests.java

@@ -128,7 +128,7 @@ void createRetryPolicyWithDefaultsMatchesBackOffDefaults() {
 	@Test
 	void createRetryPolicyWithCustomAttributes() {
 		RetryPolicySettings settings = new RetryPolicySettings();
-		settings.setMaxAttempts(10L);
+		settings.setMaxRetries(10L);
 		settings.setDelay(Duration.ofSeconds(2));
 		settings.setJitter(Duration.ofMillis(500));
 		settings.setMultiplier(2.0);

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

@@ -1102,9 +1102,9 @@ public static class Retry {
 		private boolean enabled;
 
 		/**
-		 * Maximum number of attempts to deliver a message.
+		 * Maximum number of retry attempts to deliver a message.
 		 */
-		private long maxAttempts = 3;
+		private long maxRetries = 3;
 
 		/**
 		 * Duration between the first and second attempt to deliver a message.
@@ -1129,12 +1129,12 @@ public void setEnabled(boolean enabled) {
 			this.enabled = enabled;
 		}
 
-		public long getMaxAttempts() {
-			return this.maxAttempts;
+		public long getMaxRetries() {
+			return this.maxRetries;
 		}
 
-		public void setMaxAttempts(long maxAttempts) {
-			this.maxAttempts = maxAttempts;
+		public void setMaxRetries(long maxRetries) {
+			this.maxRetries = maxRetries;
 		}
 
 		public Duration getInitialInterval() {
@@ -1164,7 +1164,7 @@ public void setMaxInterval(Duration maxInterval) {
 		RetryPolicySettings initializeRetryPolicySettings() {
 			PropertyMapper map = PropertyMapper.get();
 			RetryPolicySettings settings = new RetryPolicySettings();
-			map.from(this::getMaxAttempts).to(settings::setMaxAttempts);
+			map.from(this::getMaxRetries).to(settings::setMaxRetries);
 			map.from(this::getInitialInterval).to(settings::setDelay);
 			map.from(this::getMultiplier).to(settings::setMultiplier);
 			map.from(this::getMaxInterval).to(settings::setMaxDelay);

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

@@ -326,7 +326,7 @@ void testRabbitTemplateMessageConverters() {
 	void testRabbitTemplateRetry() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.template.retry.enabled:true",
-					"spring.rabbitmq.template.retry.max-attempts:4",
+					"spring.rabbitmq.template.retry.max-retries:4",
 					"spring.rabbitmq.template.retry.initial-interval:2000",
 					"spring.rabbitmq.template.retry.multiplier:1.5", "spring.rabbitmq.template.retry.max-interval:5000",
 					"spring.rabbitmq.template.receive-timeout:123", "spring.rabbitmq.template.reply-timeout:456")
@@ -537,7 +537,7 @@ void testSimpleRabbitListenerContainerFactoryWithCustomSettings() {
 		this.contextRunner
 			.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
-					"spring.rabbitmq.listener.simple.retry.max-attempts:4",
+					"spring.rabbitmq.listener.simple.retry.max-retries:4",
 					"spring.rabbitmq.listener.simple.retry.initial-interval:2000",
 					"spring.rabbitmq.listener.simple.retry.multiplier:1.5",
 					"spring.rabbitmq.listener.simple.retry.max-interval:5000",
@@ -615,7 +615,7 @@ void testDirectRabbitListenerContainerFactoryWithCustomSettings() {
 			.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.listener.type:direct",
 					"spring.rabbitmq.listener.direct.retry.enabled:true",
-					"spring.rabbitmq.listener.direct.retry.max-attempts:4",
+					"spring.rabbitmq.listener.direct.retry.max-retries:4",
 					"spring.rabbitmq.listener.direct.retry.initial-interval:2000",
 					"spring.rabbitmq.listener.direct.retry.multiplier:1.5",
 					"spring.rabbitmq.listener.direct.retry.max-interval:5000",
@@ -654,7 +654,7 @@ void testDirectRabbitListenerContainerFactoryWithDefaultForceStop() {
 	void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
 		this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
-					"spring.rabbitmq.listener.simple.retry.max-attempts:4")
+					"spring.rabbitmq.listener.simple.retry.max-retries:4")
 			.run((context) -> {
 				SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory = context
 					.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
@@ -668,7 +668,7 @@ void testDirectRabbitListenerContainerFactoryRetryWithCustomizer() {
 		this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.listener.type:direct",
 					"spring.rabbitmq.listener.direct.retry.enabled:true",
-					"spring.rabbitmq.listener.direct.retry.max-attempts:4")
+					"spring.rabbitmq.listener.direct.retry.max-retries:4")
 			.run((context) -> {
 				DirectRabbitListenerContainerFactory rabbitListenerContainerFactory = context
 					.getBean("rabbitListenerContainerFactory", DirectRabbitListenerContainerFactory.class);
@@ -1224,7 +1224,7 @@ ConnectionNameStrategy myConnectionNameStrategy() {
 	@Configuration(proxyBeanMethods = false)
 	static class RabbitRetryTemplateCustomizerConfiguration {
 
-		private final RetryPolicy retryPolicy = RetryPolicy.withMaxAttempts(1);
+		private final RetryPolicy retryPolicy = RetryPolicy.withMaxRetries(1);
 
 		@Bean
 		RabbitTemplateRetrySettingsCustomizer rabbitTemplateRetryTemplateCustomizer() {

module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaAutoConfiguration.java

@@ -228,7 +228,7 @@ private void applyKafkaConnectionDetailsForAdmin(Map<String, Object> properties,
 
 	static BackOff getBackOff(Backoff retryTopicBackoff) {
 		PropertyMapper map = PropertyMapper.get();
-		RetryPolicy.Builder builder = RetryPolicy.builder().maxAttempts(Long.MAX_VALUE);
+		RetryPolicy.Builder builder = RetryPolicy.builder().maxRetries(Long.MAX_VALUE);
 		map.from(retryTopicBackoff.getDelay()).to(builder::delay);
 		map.from(retryTopicBackoff.getMaxDelay()).when(Predicate.not(Duration::isZero)).to(builder::maxDelay);
 		map.from(retryTopicBackoff.getMultiplier()).to(builder::multiplier);