From fc8227e42bd9ba4b655dc85d2b45cb700839381b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 10 Sep 2018 17:38:42 +0200
Subject: [PATCH] GH-1460 polishing

Added use of CollectionUtils

Resolves #1468
---
 .../cloud/stream/binder/AbstractBinder.java         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 c13b5039b..6e4923dd8 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
@@ -34,6 +34,7 @@ import org.springframework.retry.backoff.ExponentialBackOffPolicy;
 import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -180,14 +181,10 @@ public abstract class AbstractBinder<T, C extends ConsumerProperties, P extends
 		RetryTemplate rt = this.consumerBindingRetryTemplate;
 		if (rt == null) {
 			rt = new RetryTemplate();
-			SimpleRetryPolicy retryPolicy;
-			if (properties.getRetryableExceptions().size() == 0) {
-				retryPolicy = new SimpleRetryPolicy(properties.getMaxAttempts());
-			}
-			else {
-				retryPolicy = new SimpleRetryPolicy(properties.getMaxAttempts(), properties.getRetryableExceptions(),
-						true, properties.isDefaultRetryable());
-			}
+			SimpleRetryPolicy retryPolicy = CollectionUtils.isEmpty(properties.getRetryableExceptions())
+					? new SimpleRetryPolicy(properties.getMaxAttempts())
+							: new SimpleRetryPolicy(properties.getMaxAttempts(), properties.getRetryableExceptions(), true, properties.isDefaultRetryable());
+
 			ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
 			backOffPolicy.setInitialInterval(properties.getBackOffInitialInterval());
 			backOffPolicy.setMultiplier(properties.getBackOffMultiplier());