feat: setter for Log of RetryTemplate

Author: klopfdreh

src/main/java/org/springframework/retry/support/RetryTemplate.java

@@ -87,7 +87,7 @@ public class RetryTemplate implements RetryOperations {
 	 */
 	private static final String GLOBAL_STATE = "state.global";
 
-	protected final Log logger = LogFactory.getLog(getClass());
+	protected Log logger = LogFactory.getLog(getClass());
 
 	private volatile BackOffPolicy backOffPolicy = new NoBackOffPolicy();
 
@@ -186,6 +186,17 @@ public boolean hasListeners() {
 		return this.listeners.length > 0;
 	}
 
+	/**
+	 * Setter for {@link Log}. If not applied the following is used:
+	 * <p>
+	 * {@code LogFactory.getLog(getClass())}
+	 * </p>
+	 * @param logger the logger the retry template uses for logging
+	 */
+	public void setLogger(Log logger) {
+		this.logger = logger;
+	}
+
 	/**
 	 * Setter for {@link BackOffPolicy}.
 	 * @param backOffPolicy the {@link BackOffPolicy}

src/main/java/org/springframework/retry/support/RetryTemplateBuilder.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import org.apache.commons.logging.Log;
 import org.springframework.classify.BinaryExceptionClassifier;
 import org.springframework.classify.BinaryExceptionClassifierBuilder;
 import org.springframework.retry.RetryListener;
@@ -85,6 +86,8 @@ public class RetryTemplateBuilder {
 
 	private RetryPolicy baseRetryPolicy;
 
+	private Log logger;
+
 	private BackOffPolicy backOffPolicy;
 
 	private List<RetryListener> listeners;
@@ -288,6 +291,22 @@ public RetryTemplateBuilder exponentialBackoff(Duration initialInterval, double
 		return this.exponentialBackoff(initialInterval.toMillis(), multiplier, maxInterval.toMillis(), withRandom);
 	}
 
+	/**
+	 * Applies a dedicated logger to the {@link RetryTemplate}. If not applied the
+	 * following is used:
+	 * <p>
+	 * {@code LogFactory.getLog(getClass())}
+	 * </p>
+	 * @param logger the logger which should be used for logging
+	 * @return this
+	 */
+	public RetryTemplateBuilder withLogger(Log logger) {
+		Assert.isNull(this.logger, "You have already applied a logger");
+		Assert.notNull(logger, "The given logger should not be null");
+		this.logger = logger;
+		return this;
+	}
+
 	/**
 	 * Perform each retry after a fixed amount of time.
 	 * @param interval fixed interval in milliseconds
@@ -584,6 +603,12 @@ public RetryTemplate build() {
 		finalPolicy.setPolicies(new RetryPolicy[] { this.baseRetryPolicy, exceptionRetryPolicy });
 		retryTemplate.setRetryPolicy(finalPolicy);
 
+		// Logger
+
+		if (this.logger != null) {
+			retryTemplate.setLogger(this.logger);
+		}
+
 		// Backoff policy
 
 		if (this.backOffPolicy == null) {

src/test/java/org/springframework/retry/support/RetryTemplateBuilderTests.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import org.apache.commons.logging.Log;
 import org.junit.jupiter.api.Test;
 import org.springframework.classify.BinaryExceptionClassifier;
 import org.springframework.retry.RetryListener;
@@ -346,6 +347,21 @@ public void testValidateZeroInitInterval() {
 			.isThrownBy(() -> RetryTemplate.builder().exponentialBackoff(0, 2, 200).build());
 	}
 
+	@Test
+	public void testBuilderWithLogger() {
+		Log logMock = mock(Log.class);
+		RetryTemplate retryTemplate = RetryTemplate.builder().withLogger(logMock).build();
+		Log logger = getPropertyValue(retryTemplate, "logger", Log.class);
+		assertThat(logger).isEqualTo(logMock);
+	}
+
+	@Test
+	public void testBuilderWithDefaultLogger() {
+		RetryTemplate retryTemplate = RetryTemplate.builder().build();
+		Log logger = getPropertyValue(retryTemplate, "logger", Log.class);
+		assertThat(logger).isNotNull();
+	}
+
 	/* ---------------- Utils -------------- */
 
 	private static class PolicyTuple {

src/test/java/org/springframework/retry/support/RetryTemplateTests.java

@@ -20,8 +20,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.logging.Log;
 import org.junit.jupiter.api.Test;
 
+import org.mockito.ArgumentCaptor;
 import org.springframework.classify.BinaryExceptionClassifier;
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
@@ -45,6 +47,7 @@
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * @author Rob Harrop
@@ -53,6 +56,7 @@
  * @author Henning Pöttker
  * @author Emanuele Ivaldi
  * @author Morulai Planinski
+ * @author Tobias Soloschenko
  */
 public class RetryTemplateTests {
 
@@ -286,7 +290,6 @@ public void testRethrowError() {
 		}
 	}
 
-	@SuppressWarnings("serial")
 	@Test
 	public void testFailedPolicy() {
 		RetryTemplate retryTemplate = new RetryTemplate();
@@ -325,7 +328,6 @@ public void testNoBackOffForRethrownException() {
 		tested.setRetryPolicy(new SimpleRetryPolicy(1));
 
 		BackOffPolicy bop = mock(BackOffPolicy.class);
-		@SuppressWarnings("serial")
 		BackOffContext backOffContext = new BackOffContext() {
 		};
 		tested.setBackOffPolicy(bop);
@@ -439,4 +441,17 @@ public void backOff(BackOffContext backOffContext) throws BackOffInterruptedExce
 
 	}
 
+	@Test
+	public void testLoggingAppliedCorrectly() throws Exception {
+		ArgumentCaptor<String> logOutputCaptor = ArgumentCaptor.forClass(String.class);
+		RetryTemplate retryTemplate = new RetryTemplate();
+		Log logMock = mock(Log.class);
+		when(logMock.isTraceEnabled()).thenReturn(false);
+		when(logMock.isDebugEnabled()).thenReturn(true);
+		retryTemplate.setLogger(logMock);
+		retryTemplate.execute(new MockRetryCallback());
+		verify(logMock).debug(logOutputCaptor.capture());
+		assertThat(logOutputCaptor.getValue()).contains("Retry: count=0");
+	}
+
 }