From 6323ae33115f05c916468fd7d867c1b18b0e41a9 Mon Sep 17 00:00:00 2001
From: Tobias Soloschenko <tsoloschenko@apache.org>
Date: Thu, 19 Sep 2024 08:33:07 +0200
Subject: [PATCH] fix: use setter of logger for RetryTemplate

---
 .../config/client/RetryTemplateFactory.java   | 24 ++-----------------
 spring-cloud-config-dependencies/pom.xml      |  6 +++++
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RetryTemplateFactory.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RetryTemplateFactory.java
index 99ac656565..60b10da899 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RetryTemplateFactory.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RetryTemplateFactory.java
@@ -16,43 +16,23 @@
 
 package org.springframework.cloud.config.client;
 
-import java.lang.reflect.Field;
-
 import org.apache.commons.logging.Log;
 
 import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.ReflectionUtils;
 
 public final class RetryTemplateFactory {
 
-	private static final Field field;
-
-	static {
-		field = ReflectionUtils.findField(RetryTemplate.class, "logger");
-		if (field != null) {
-			ReflectionUtils.makeAccessible(field);
-		}
-	}
-
 	private RetryTemplateFactory() {
 
 	}
 
 	public static RetryTemplate create(RetryProperties properties, Log log) {
-		RetryTemplate retryTemplate = RetryTemplate.builder()
+		return RetryTemplate.builder()
 			.maxAttempts(properties.getMaxAttempts())
 			.exponentialBackoff(properties.getInitialInterval(), properties.getMultiplier(),
 					properties.getMaxInterval(), properties.isUseRandomPolicy())
+			.withLogger(log)
 			.build();
-		try {
-			field.set(retryTemplate, log);
-		}
-		catch (IllegalAccessException e) {
-			if (log.isErrorEnabled()) {
-				log.error("error setting retry log", e);
-			}
-		}
-		return retryTemplate;
 	}
 
 }
diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index 75ba630e18..1ab38dba02 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -18,6 +18,7 @@
 		<jgit.version>6.6.1.202309021850-r</jgit.version>
 		<spring-vault.version>3.1.1</spring-vault.version>
 		<spring-credhub.version>2.1.1.RELEASE</spring-credhub.version>
+		<spring-retry.version>2.0.10</spring-retry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -41,6 +42,11 @@
 				<artifactId>spring-cloud-config-monitor</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.retry</groupId>
+				<artifactId>spring-retry</artifactId>
+				<version>${spring-retry.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-core</artifactId>