GH-1886 More RetryTemplate Related Deprecations

Author: garyrussell

Diff for: spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java

@@ -188,7 +188,9 @@ public void setRetryTemplate(RetryTemplate retryTemplate) {
 	 * Set a callback to be used with the {@link #setRetryTemplate(RetryTemplate)
 	 * retryTemplate}.
 	 * @param recoveryCallback the callback.
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
 	 */
+	@Deprecated
 	public void setRecoveryCallback(RecoveryCallback<? extends Object> recoveryCallback) {
 		this.recoveryCallback = recoveryCallback;
 	}
@@ -201,7 +203,9 @@ public void setRecoveryCallback(RecoveryCallback<? extends Object> recoveryCallb
 	 * alive.
 	 * @param statefulRetry true to enable stateful retry.
 	 * @since 2.1.3
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
 	 */
+	@Deprecated
 	public void setStatefulRetry(boolean statefulRetry) {
 		this.statefulRetry = statefulRetry;
 	}

Diff for: spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java

@@ -343,6 +343,12 @@ public void setRetryTemplate(RetryTemplate retryTemplate) {
 		this.retryTemplate = retryTemplate;
 	}
 
+	/**
+	 * Get the recovery callback.
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
+	 * @return the recovery callback.
+	 */
+	@Deprecated
 	@Nullable
 	protected RecoveryCallback<?> getRecoveryCallback() {
 		return this.recoveryCallback;
@@ -351,11 +357,18 @@ protected RecoveryCallback<?> getRecoveryCallback() {
 	/**
 	 * Set a callback to be used with the {@link #setRetryTemplate(RetryTemplate)}.
 	 * @param recoveryCallback the callback.
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
 	 */
+	@Deprecated
 	public void setRecoveryCallback(RecoveryCallback<? extends Object> recoveryCallback) {
 		this.recoveryCallback = recoveryCallback;
 	}
 
+	/**
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
+	 * @return
+	 */
+	@Deprecated
 	protected boolean isStatefulRetry() {
 		return this.statefulRetry;
 	}
@@ -368,7 +381,9 @@ protected boolean isStatefulRetry() {
 	 * alive.
 	 * @param statefulRetry true to enable stateful retry.
 	 * @since 2.1.3
+	 * @deprecated since 2.8 - use a suitably configured error handler instead.
 	 */
+	@Deprecated
 	public void setStatefulRetry(boolean statefulRetry) {
 		this.statefulRetry = statefulRetry;
 	}