Moving from withMaxAttempts to withMaxRetries

Author: ryanjbaxter

docs/modules/ROOT/pages/spring-cloud-circuitbreaker-framework-retry.adoc

@@ -42,7 +42,7 @@ To provide a default configuration for all of your circuit breakers, create a `C
 @Bean
 public Customizer<FrameworkRetryCircuitBreakerFactory> defaultCustomizer() {
 	return factory -> factory.configureDefault(id -> new FrameworkRetryConfigBuilder(id)
-		.retryPolicy(RetryPolicy.withMaxAttempts(3))
+		.retryPolicy(RetryPolicy.withMaxRetries(3))
 		.openTimeout(Duration.ofSeconds(20))
 		.resetTimeout(Duration.ofSeconds(5))
 		.build());
@@ -69,7 +69,7 @@ Similarly to providing a default configuration, you can create a `Customizer` be
 @Bean
 public Customizer<FrameworkRetryCircuitBreakerFactory> slowCustomizer() {
 	return factory -> factory.configure(builder -> builder
-		.retryPolicy(RetryPolicy.withMaxAttempts(1))
+		.retryPolicy(RetryPolicy.withMaxRetries(1))
 		.openTimeout(Duration.ofSeconds(30))
 		.resetTimeout(Duration.ofSeconds(10))
 		.build(), "slow");
@@ -81,7 +81,7 @@ public Customizer<FrameworkRetryCircuitBreakerFactory> slowCustomizer() {
 
 Spring Framework 7 provides several built-in retry policies that can be used with the Framework Retry circuit breaker:
 
-* `RetryPolicy.withMaxAttempts(int)` - Retries a fixed number of times
+* `RetryPolicy.withMaxRetries(int)` - Retries a fixed number of times
 * `RetryPolicy.withMaxDuration(Duration)` - Retries until a maximum duration is reached
 * `RetryPolicy.withBackoff(Duration, double)` - Retries with exponential backoff
 * `RetryPolicy.forExceptions(Class<?>...)` - Retries only for specific exception types
@@ -93,7 +93,7 @@ You can also combine policies using `and()` and `or()` operators:
 @Bean
 public Customizer<FrameworkRetryCircuitBreakerFactory> customRetryPolicy() {
 	return factory -> factory.configureDefault(id -> new FrameworkRetryConfigBuilder(id)
-		.retryPolicy(RetryPolicy.withMaxAttempts(3)
+		.retryPolicy(RetryPolicy.withMaxRetries(3)
 			.and(RetryPolicy.withMaxDuration(Duration.ofSeconds(5)))
 			.forExceptions(IOException.class, TimeoutException.class))
 		.build());
@@ -151,7 +151,7 @@ public class CircuitBreakerConfiguration {
 		return factory -> {
 			// Default configuration for all circuit breakers
 			factory.configureDefault(id -> new FrameworkRetryConfigBuilder(id)
-				.retryPolicy(RetryPolicy.withMaxAttempts(3)
+				.retryPolicy(RetryPolicy.withMaxRetries(3)
 					.withBackoff(Duration.ofMillis(100), 2.0))
 				.openTimeout(Duration.ofSeconds(20))
 				.resetTimeout(Duration.ofSeconds(5))
@@ -164,14 +164,14 @@ public class CircuitBreakerConfiguration {
 		return factory -> {
 			// Specific configuration for "slow" circuit breaker
 			factory.configure(builder -> builder
-				.retryPolicy(RetryPolicy.withMaxAttempts(1))
+				.retryPolicy(RetryPolicy.withMaxRetries(1))
 				.openTimeout(Duration.ofSeconds(30))
 				.resetTimeout(Duration.ofSeconds(10))
 				.build(), "slow");
 
 			// Specific configuration for "critical" circuit breaker
 			factory.configure(builder -> builder
-				.retryPolicy(RetryPolicy.withMaxAttempts(5))
+				.retryPolicy(RetryPolicy.withMaxRetries(5))
 				.openTimeout(Duration.ofMinutes(2))
 				.resetTimeout(Duration.ofSeconds(15))
 				.build(), "critical");

spring-cloud-circuitbreaker-framework-retry/src/test/java/org/springframework/cloud/circuitbreaker/retry/FrameworkRetryCircuitBreakerFactoryTest.java

@@ -91,7 +91,7 @@ void testConfigBuilder() {
 
 		assertThat(builder).isNotNull();
 
-		FrameworkRetryConfig config = builder.retryPolicy(RetryPolicy.withMaxAttempts(5))
+		FrameworkRetryConfig config = builder.retryPolicy(RetryPolicy.withMaxRetries(5))
 			.openTimeout(Duration.ofSeconds(15))
 			.resetTimeout(Duration.ofSeconds(3))
 			.build();

spring-cloud-circuitbreaker-framework-retry/src/test/java/org/springframework/cloud/circuitbreaker/retry/FrameworkRetryCircuitBreakerIntegrationTest.java

@@ -111,7 +111,7 @@ static class TestConfiguration {
 		public Customizer<FrameworkRetryCircuitBreakerFactory> customizer() {
 			return factory -> {
 				factory.configureDefault(
-						id -> new FrameworkRetryConfigBuilder(id).retryPolicy(RetryPolicy.withMaxAttempts(2))
+						id -> new FrameworkRetryConfigBuilder(id).retryPolicy(RetryPolicy.withMaxRetries(2))
 							.openTimeout(Duration.ofMillis(100))
 							.resetTimeout(Duration.ofSeconds(5))
 							.build());

spring-cloud-circuitbreaker-framework-retry/src/test/java/org/springframework/cloud/circuitbreaker/retry/FrameworkRetryCircuitBreakerTest.java

@@ -57,7 +57,7 @@ void testRunWithRetry() {
 		// Test that retries are attempted successfully
 		AtomicInteger attempts = new AtomicInteger(0);
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(2)) // 1 initial + 2 retries = 3
+			.retryPolicy(RetryPolicy.withMaxRetries(2)) // 1 initial + 2 retries = 3
 															// attempts
 			.build();
 		FrameworkRetryCircuitBreaker circuitBreaker = new FrameworkRetryCircuitBreaker("test", config);
@@ -82,7 +82,7 @@ void testRunWithRetry() {
 	void testCircuitOpensAfterSingleFailedExecution() {
 		// Use no retries so a single failure causes the circuit to open
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(0))
+			.retryPolicy(RetryPolicy.withMaxRetries(0))
 			.openTimeout(Duration.ofSeconds(20))
 			.resetTimeout(Duration.ofSeconds(5))
 			.build();
@@ -99,7 +99,7 @@ void testCircuitOpensAfterSingleFailedExecution() {
 	@Test
 	void testCircuitBreakerOpenReturnsFallback() {
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(0))
+			.retryPolicy(RetryPolicy.withMaxRetries(0))
 			.openTimeout(Duration.ofSeconds(20))
 			.resetTimeout(Duration.ofSeconds(5))
 			.build();
@@ -126,7 +126,7 @@ void testCircuitBreakerOpenReturnsFallback() {
 	@Test
 	void testCircuitHalfOpenAfterTimeout() throws InterruptedException {
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(0))
+			.retryPolicy(RetryPolicy.withMaxRetries(0))
 			.openTimeout(Duration.ofMillis(100))
 			.resetTimeout(Duration.ofSeconds(5))
 			.build();
@@ -152,7 +152,7 @@ void testCircuitHalfOpenAfterTimeout() throws InterruptedException {
 	@Test
 	void testCircuitReopensOnFailureInHalfOpen() throws InterruptedException {
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(0))
+			.retryPolicy(RetryPolicy.withMaxRetries(0))
 			.openTimeout(Duration.ofMillis(100))
 			.resetTimeout(Duration.ofSeconds(5))
 			.build();
@@ -191,7 +191,7 @@ void testGettersReturnCorrectValues() {
 	void testCircuitOpensAfterAllRetriesExhausted() {
 		// With retries enabled, circuit opens after all retries are exhausted
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(2))
+			.retryPolicy(RetryPolicy.withMaxRetries(2))
 			.openTimeout(Duration.ofSeconds(20))
 			.resetTimeout(Duration.ofSeconds(5))
 			.build();
@@ -209,7 +209,7 @@ void testCircuitOpensAfterAllRetriesExhausted() {
 	@Test
 	void testResetTimeoutClosesCircuit() throws InterruptedException {
 		FrameworkRetryConfig config = new FrameworkRetryConfigBuilder("test")
-			.retryPolicy(RetryPolicy.withMaxAttempts(0))
+			.retryPolicy(RetryPolicy.withMaxRetries(0))
 			.openTimeout(Duration.ofSeconds(20))
 			.resetTimeout(Duration.ofMillis(100))
 			.build();