From 402543a5ccb87d188fead7e43a19d0da0f421476 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 19 Feb 2018 17:18:20 -0500
Subject: [PATCH] GH-858 made RetryTemplate injectable

Resolves #858
---
 .../cloud/stream/binder/AbstractBinder.java   | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java
index 4d2f61ac9..3137cd0db 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -44,6 +45,7 @@ import org.springframework.util.StringUtils;
  * @author Marius Bogoevici
  * @author Soby Chacko
  * @author Vinicius Carvalho
+ * @author Oleg Zhurakousky
  */
 public abstract class AbstractBinder<T, C extends ConsumerProperties, P extends ProducerProperties>
 		implements ApplicationContextAware, InitializingBean, Binder<T, C, P> {
@@ -61,6 +63,9 @@ public abstract class AbstractBinder<T, C extends ConsumerProperties, P extends
 
 	private volatile EvaluationContext evaluationContext;
 
+	@Autowired(required=false) // this would need to be refactored into constructor in the future
+	private RetryTemplate retryTemplate;
+
 	/**
 	 * For binder implementations that support a prefix, apply the prefix to the name.
 	 *
@@ -160,21 +165,25 @@ public abstract class AbstractBinder<T, C extends ConsumerProperties, P extends
 	}
 
 	/**
-	 * Create and configure a retry template.
+	 * Create and configure a default retry template unless one
+	 * has already been provided via @Bean by an application.
 	 *
 	 * @param properties The properties.
 	 * @return The retry template
 	 */
-	public RetryTemplate buildRetryTemplate(ConsumerProperties properties) {
-		RetryTemplate template = new RetryTemplate();
-		SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
-		retryPolicy.setMaxAttempts(properties.getMaxAttempts());
-		ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
-		backOffPolicy.setInitialInterval(properties.getBackOffInitialInterval());
-		backOffPolicy.setMultiplier(properties.getBackOffMultiplier());
-		backOffPolicy.setMaxInterval(properties.getBackOffMaxInterval());
-		template.setRetryPolicy(retryPolicy);
-		template.setBackOffPolicy(backOffPolicy);
-		return template;
+	protected RetryTemplate buildRetryTemplate(ConsumerProperties properties) {
+		RetryTemplate rt = this.retryTemplate;
+		if (rt == null) {
+			rt = new RetryTemplate();
+			SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
+			retryPolicy.setMaxAttempts(properties.getMaxAttempts());
+			ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
+			backOffPolicy.setInitialInterval(properties.getBackOffInitialInterval());
+			backOffPolicy.setMultiplier(properties.getBackOffMultiplier());
+			backOffPolicy.setMaxInterval(properties.getBackOffMaxInterval());
+			rt.setRetryPolicy(retryPolicy);
+			rt.setBackOffPolicy(backOffPolicy);
+		}
+		return rt;
 	}
 }