Changes maxAttempts to maxRetries from framework 7

Author: spencergibb

binders/kafka-binder/spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java

@@ -214,7 +214,7 @@ public void setMetadataRetryOperations(RetryOperations metadataRetryOperations)
 	public void afterPropertiesSet() {
 		if (this.metadataRetryOperations == null) {
 			RetryPolicy retryPolicy = RetryPolicy.builder()
-				.maxAttempts(10)
+				.maxRetries(10)
 				.delay(Duration.ofMillis(100))
 				.multiplier(2)
 				.maxDelay(Duration.ofSeconds(1))

binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/InteractiveQueryService.java

@@ -255,7 +255,7 @@ private RetryTemplate getRetryTemplate() {
 
 		var stateStoreRetry = this.binderConfigurationProperties.getStateStoreRetry();
 		RetryPolicy retryPolicy = RetryPolicy.builder()
-			.maxAttempts(stateStoreRetry.getMaxAttempts())
+			.maxRetries(stateStoreRetry.getMaxAttempts())
 			.delay(Duration.ofMillis(stateStoreRetry.getBackoffPeriod()))
 			.build();
 

binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsRetryTests.java

@@ -190,7 +190,7 @@ public static class CustomRetryTemplateApp {
 		@Bean
 		@StreamRetryTemplate
 		RetryTemplate fooRetryTemplate() {
-			return new RetryTemplate(RetryPolicy.builder().maxAttempts(4).delay(Duration.ofMillis(1)).build());
+			return new RetryTemplate(RetryPolicy.builder().maxRetries(4).delay(Duration.ofMillis(1)).build());
 		}
 
 		@Bean

binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/AutoCreateTopicDisabledTests.java

@@ -104,7 +104,7 @@ void autoCreateTopicDisabledFailsOnProducerIfTopicNonExistentOnBroker() {
 		KafkaTopicProvisioner provisioningProvider = new KafkaTopicProvisioner(
 				configurationProperties, kafkaProperties, prop -> {
 		});
-		RetryPolicy retryPolicy = RetryPolicy.builder().maxAttempts(1).delay(Duration.ZERO).build();
+		RetryPolicy retryPolicy = RetryPolicy.builder().maxRetries(1).delay(Duration.ZERO).build();
 		provisioningProvider.setMetadataRetryOperations(new RetryTemplate(retryPolicy));
 
 		KafkaMessageChannelBinder binder = new KafkaMessageChannelBinder(

binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTransactionCustomizerTest.java

@@ -77,7 +77,7 @@ void clientFactoryCustomizerAppliedBeforeTransactionManager() throws Exception {
 		KafkaTopicProvisioner provisioningProvider = new KafkaTopicProvisioner(
 			configurationProperties, kafkaProperties, prop -> {
 		});
-		RetryPolicy retryPolicy = RetryPolicy.builder().maxAttempts(2).delay(Duration.ZERO).build();
+		RetryPolicy retryPolicy = RetryPolicy.builder().maxRetries(2).delay(Duration.ZERO).build();
 		provisioningProvider.setMetadataRetryOperations(new RetryTemplate(retryPolicy));
 
 		// Create a tracking list for customized factories

binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTransactionTests.java

@@ -85,7 +85,7 @@ void producerRunsInTx() throws Exception {
 		KafkaTopicProvisioner provisioningProvider = new KafkaTopicProvisioner(
 				configurationProperties, kafkaProperties, prop -> {
 		});
-		RetryPolicy retryPolicy = RetryPolicy.builder().maxAttempts(2).delay(Duration.ZERO).build();
+		RetryPolicy retryPolicy = RetryPolicy.builder().maxRetries(2).delay(Duration.ZERO).build();
 		provisioningProvider.setMetadataRetryOperations(new RetryTemplate(retryPolicy));
 		final Producer mockProducer = mock(Producer.class);
 		given(mockProducer.send(any(), any())).willReturn(new CompletableFuture<>());

binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java

@@ -1052,7 +1052,7 @@ private RabbitTemplate buildRabbitTemplate(RabbitProducerProperties properties,
 				&& rabbitProperties.getTemplate().getRetry().isEnabled()) {
 			Retry retry = rabbitProperties.getTemplate().getRetry();
 			RetryPolicy retryPolicy = RetryPolicy.builder()
-				.maxAttempts(retry.getMaxAttempts())
+				.maxRetries(retry.getMaxRetries())
 				.delay(retry.getInitialInterval())
 				.multiplier(retry.getMultiplier())
 				.maxDelay(retry.getMaxInterval())

core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java

@@ -209,7 +209,7 @@ protected RetryTemplate buildRetryTemplate(ConsumerProperties properties) {
 			}
 			RetryPolicy retryPolicy =
 				RetryPolicy.builder()
-					.maxAttempts(properties.getMaxAttempts())
+					.maxRetries(properties.getMaxAttempts())
 					.delay(Duration.ofMillis(properties.getBackOffInitialInterval()))
 					.multiplier(properties.getBackOffMultiplier())
 					.maxDelay(Duration.ofMillis(properties.getBackOffMaxInterval()))