SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1460 polishing

Browse Source 
Added use of CollectionUtils

Resolves #1468
This commit is contained in:
Oleg Zhurakousky
2018-09-10 17:38:42 +02:00
parent de6aa8986b
commit fc8227e42b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java
View File

@@ -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());