Spring/spring-retry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Dave Syer
2016-09-26 10:10:52 +01:00
parent 2e293c33c3
commit e6a83c0556
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java
View File

@@ -144,17 +144,13 @@ public class StatefulRetryOperationsInterceptor implements MethodInterceptor {
+ ObjectUtils.getIdentityHexString(invocation) + ")");
}
String name = StringUtils.hasText(label) ? label : invocation.getMethod().toGenericString();
Object[] args = invocation.getArguments();
Object defaultKey = Arrays.asList(args);
if (args.length == 1) {
defaultKey = args[0];
}
Object generatedKey = this.keyGenerator != null ? this.keyGenerator.getKey(invocation.getArguments()) : null;
Object key = this.keyGenerator == null || generatedKey != null
? Arrays.asList(name, generatedKey != null ? generatedKey : defaultKey ) : null;
Object key = createKey(invocation, defaultKey);
RetryState retryState = new DefaultRetryState(key,
this.newMethodArgumentsIdentifier != null
&& this.newMethodArgumentsIdentifier.isNew(args),
@@ -175,6 +171,21 @@ public class StatefulRetryOperationsInterceptor implements MethodInterceptor {
}
private Object createKey(final MethodInvocation invocation, Object defaultKey) {
Object generatedKey = defaultKey;
if (this.keyGenerator != null) {
generatedKey = this.keyGenerator.getKey(invocation.getArguments());
}
if (generatedKey == null) {
// If there's a generator and he still says the key is null, that means he
// really doesn't want to retry.
return null;
}
String name = StringUtils.hasText(label) ? label
: invocation.getMethod().toGenericString();
return Arrays.asList(name, generatedKey);
}
/**
* @author Dave Syer
*