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

OPEN - issue BATCH-777: Parametrise RetryCallback and related interfaces

Browse Source 
Simplify RetryPolicy interface now that they are all stateless
This commit is contained in:
dsyer
2008-08-25 12:23:58 +00:00
parent 1da437fb00
commit d79e1b8542
16 changed files with 77 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java
View File

@@ -24,7 +24,7 @@ public class AlwaysRetryPolicyTests extends TestCase {
public void testSimpleOperations() throws Exception {
AlwaysRetryPolicy policy = new AlwaysRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
policy.registerThrowable(context, null);
@@ -35,7 +35,7 @@ public class AlwaysRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
AlwaysRetryPolicy policy = new AlwaysRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -46,8 +46,8 @@ public class AlwaysRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
AlwaysRetryPolicy policy = new AlwaysRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

18
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java
View File

@@ -29,7 +29,7 @@ public class CompositeRetryPolicyTests extends TestCase {
public void testEmptyPolicies() throws Exception {
CompositeRetryPolicy policy = new CompositeRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
}
@@ -37,7 +37,7 @@ public class CompositeRetryPolicyTests extends TestCase {
public void testTrivialPolicies() throws Exception {
CompositeRetryPolicy policy = new CompositeRetryPolicy();
policy.setPolicies(new RetryPolicy[] { new MockRetryPolicySupport(), new MockRetryPolicySupport() });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
}
@@ -49,7 +49,7 @@ public class CompositeRetryPolicyTests extends TestCase {
return false;
}
} });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertFalse(policy.canRetry(context));
}
@@ -67,7 +67,7 @@ public class CompositeRetryPolicyTests extends TestCase {
errorRegistered = true;
}
} });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
policy.registerThrowable(context, null);
@@ -86,7 +86,7 @@ public class CompositeRetryPolicyTests extends TestCase {
list.add("2");
}
} });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.close(context, true);
assertEquals(2, list.size());
@@ -105,7 +105,7 @@ public class CompositeRetryPolicyTests extends TestCase {
list.add("2");
}
} });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
try {
policy.close(context, true);
@@ -119,7 +119,7 @@ public class CompositeRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
CompositeRetryPolicy policy = new CompositeRetryPolicy();
policy.setPolicies(new RetryPolicy[] { new MockRetryPolicySupport(), new MockRetryPolicySupport() });
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -130,8 +130,8 @@ public class CompositeRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
CompositeRetryPolicy policy = new CompositeRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

20
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java
View File

@@ -31,14 +31,14 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
ExceptionClassifierRetryPolicy policy = new ExceptionClassifierRetryPolicy();
public void testDefaultPolicies() throws Exception {
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
}
public void testTrivialPolicies() throws Exception {
policy.setPolicyMap(Collections.singletonMap(ExceptionClassifierSupport.DEFAULT,
(RetryPolicy) new MockRetryPolicySupport()));
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
}
@@ -46,7 +46,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
public void testNullPolicies() throws Exception {
policy.setPolicyMap(new HashMap<String, RetryPolicy>());
try {
policy.open(null, null);
policy.open(null);
fail("Expected IllegalArgumentException");
}
catch (IllegalArgumentException e) {
@@ -59,7 +59,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
map.put(ExceptionClassifierSupport.DEFAULT, new NeverRetryPolicy());
policy.setPolicyMap(map);
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
@@ -72,7 +72,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
map.put("foo", new NeverRetryPolicy());
policy.setPolicyMap(map);
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
assertTrue(policy.canRetry(context));
@@ -94,7 +94,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
assertTrue(policy.canRetry(context));
// But now the classifier will be active in the new context...
context = policy.open(null, null);
context = policy.open(null);
assertTrue(policy.canRetry(context));
policy.registerThrowable(context, new IllegalArgumentException());
assertFalse(policy.canRetry(context));
@@ -110,7 +110,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
count++;
}
}));
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
// The mapped (child) policy hasn't been used yet, so if we close now
// we don't incur the possible expense of ceating the child context.
@@ -125,7 +125,7 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
ExceptionClassifierRetryPolicy policy = new ExceptionClassifierRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -136,8 +136,8 @@ public class ExceptionClassifierRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
ExceptionClassifierRetryPolicy policy = new ExceptionClassifierRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java
View File

@@ -24,7 +24,7 @@ public class NeverRetryPolicyTests extends TestCase {
public void testSimpleOperations() throws Exception {
NeverRetryPolicy policy = new NeverRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
// We can retry until the first exception is registered...
assertTrue(policy.canRetry(context));
@@ -37,7 +37,7 @@ public class NeverRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
NeverRetryPolicy policy = new NeverRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -48,8 +48,8 @@ public class NeverRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
NeverRetryPolicy policy = new NeverRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

18
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java
View File

@@ -28,7 +28,7 @@ public class SimpleRetryPolicyTests extends TestCase {
public void testCanRetryIfNoException() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertTrue(policy.canRetry(context));
}
@@ -36,7 +36,7 @@ public class SimpleRetryPolicyTests extends TestCase {
public void testEmptyExceptionsNeverRetry() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
// We can't retry any exceptions...
policy.setRetryableExceptionClasses(Collections.EMPTY_SET);
@@ -48,16 +48,16 @@ public class SimpleRetryPolicyTests extends TestCase {
public void testRetryLimitInitialState() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertTrue(policy.canRetry(context));
policy.setMaxAttempts(0);
context = policy.open(null, null);
context = policy.open(null);
assertFalse(policy.canRetry(context));
}
public void testRetryLimitSubsequentState() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
policy.setMaxAttempts(2);
assertTrue(policy.canRetry(context));
policy.registerThrowable(context, new Exception());
@@ -68,7 +68,7 @@ public class SimpleRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -81,7 +81,7 @@ public class SimpleRetryPolicyTests extends TestCase {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
policy.setFatalExceptionClasses(getClasses(Exception.class));
policy.setRetryableExceptionClasses(getClasses(RuntimeException.class));
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, new RuntimeException("foo"));
assertFalse(policy.canRetry(context));
@@ -99,8 +99,8 @@ public class SimpleRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
SimpleRetryPolicy policy = new SimpleRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java
View File

@@ -25,7 +25,7 @@ public class TimeoutRetryPolicyTests extends TestCase {
public void testTimeoutPreventsRetry() throws Exception {
TimeoutRetryPolicy policy = new TimeoutRetryPolicy();
policy.setTimeout(100);
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
policy.registerThrowable(context, new Exception());
assertTrue(policy.canRetry(context));
Thread.sleep(200);
@@ -35,7 +35,7 @@ public class TimeoutRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
TimeoutRetryPolicy policy = new TimeoutRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext context = policy.open(null);
assertNotNull(context);
policy.registerThrowable(context, null);
assertEquals(0, context.getRetryCount());
@@ -46,8 +46,8 @@ public class TimeoutRetryPolicyTests extends TestCase {
public void testParent() throws Exception {
TimeoutRetryPolicy policy = new TimeoutRetryPolicy();
RetryContext context = policy.open(null, null);
RetryContext child = policy.open(null, context);
RetryContext context = policy.open(null);
RetryContext child = policy.open(context);
assertNotSame(child, context);
assertSame(context, child.getParent());
}

24
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java
View File

@@ -212,30 +212,6 @@ public class RetryTemplateTests extends TestCase {
}
}
public void testFallThroughToEndUnsuccessfully() throws Exception {
MockRetryCallback callback = new MockRetryCallback();
int attempts = 3;
callback.setAttemptsBeforeSuccess(attempts);
callback.setExceptionToThrow(new IllegalArgumentException("exhausted"));
RetryTemplate retryTemplate = new RetryTemplate();
retryTemplate.setRetryPolicy(new NeverRetryPolicy() {
public boolean shouldRethrow(RetryContext context) {
// The opposite of normal...
// cause the retry to drop through to the end
// neither throwing exception nor returning successfully.
return false;
}
});
try {
retryTemplate.execute(callback);
fail("Expected IllegalArgumentException");
}
catch (IllegalArgumentException e) {
assertTrue(e.getMessage().indexOf("exhausted") >= 0);
}
}
private static class MockRetryCallback implements RetryCallback {
private int attempts;

32
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/StatefulRecoveryRetryTests.java
View File

@@ -50,17 +50,7 @@ public class StatefulRecoveryRetryTests {
@Test
public void testOpenSunnyDay() throws Exception {
final StringHolder item = new StringHolder("foo");
RetryCallback writer = new RetryCallback() {
public Object doWithRetry(RetryContext context) throws Exception {
count++;
list.add(item.string);
return item;
}
};
RetryContext context = retryTemplate.open(writer, new NeverRetryPolicy(), new RetryState("foo"));
RetryContext context = retryTemplate.open(new NeverRetryPolicy(), new RetryState("foo"));
assertNotNull(context);
// we haven't called the processor yet...
assertEquals(0, count);
@@ -70,12 +60,7 @@ public class StatefulRecoveryRetryTests {
public void testRegisterThrowable() {
NeverRetryPolicy retryPolicy = new NeverRetryPolicy();
RetryState state = new RetryState("foo");
RetryContext context = retryTemplate.open(new RetryCallback() {
public Object doWithRetry(RetryContext context) throws Exception {
count++;
return null;
}
}, retryPolicy, state);
RetryContext context = retryTemplate.open(retryPolicy, state);
assertNotNull(context);
retryTemplate.registerThrowable(retryPolicy, state, context, new Exception());
assertFalse(retryPolicy.canRetry(context));
@@ -85,12 +70,7 @@ public class StatefulRecoveryRetryTests {
public void testClose() throws Exception {
NeverRetryPolicy retryPolicy = new NeverRetryPolicy();
RetryState state = new RetryState("foo");
RetryContext context = retryTemplate.open(new RetryCallback() {
public Object doWithRetry(RetryContext context) throws Exception {
count++;
return null;
}
}, retryPolicy, state);
RetryContext context = retryTemplate.open(retryPolicy, state);
assertNotNull(context);
retryTemplate.registerThrowable(retryPolicy, state, context, new Exception());
assertFalse(retryPolicy.canRetry(context));
@@ -170,7 +150,7 @@ public class StatefulRecoveryRetryTests {
// expected
}
RetryContext context = retryTemplate.open(callback, retryPolicy, state);
RetryContext context = retryTemplate.open(retryPolicy, state);
// True after exhausted - the history is reset...
assertTrue(retryPolicy.canRetry(context));
}
@@ -203,7 +183,7 @@ public class StatefulRecoveryRetryTests {
assertTrue("Message doesn't contain 'inconsistent': " + message, message.indexOf("inconsistent") >= 0);
}
RetryContext context = retryTemplate.open(callback, retryPolicy, state);
RetryContext context = retryTemplate.open(retryPolicy, state);
// True after exhausted - the history is reset...
assertEquals(0, context.getRetryCount());
@@ -270,7 +250,7 @@ public class StatefulRecoveryRetryTests {
}
retryTemplate.execute(callback, recoveryCallback, state);
RetryContext context = retryTemplate.open(callback, retryPolicy, state);
RetryContext context = retryTemplate.open(retryPolicy, state);
// True after exhausted - the history is reset...
assertEquals(0, context.getRetryCount());