From ed6f991a761f8743a10e91a344ddcf80da6583f3 Mon Sep 17 00:00:00 2001 From: robokaso Date: Sat, 8 Mar 2008 20:40:19 +0000 Subject: [PATCH] RESOLVED - BATCH-434 and BATCH-438 ExitStatus cleaned up (postponed commit from friday) --- .../batch/execution/job/SimpleJobTests.java | 4 ++-- .../org/springframework/batch/repeat/ExitStatus.java | 11 ----------- .../springframework/batch/repeat/ExitStatusTests.java | 5 ----- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java index 6db3446b5..ed6b028ac 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java @@ -234,7 +234,7 @@ public class SimpleJobTests extends TestCase { assertEquals(exception, e.getCause()); } assertEquals(0, list.size()); - checkRepository(BatchStatus.STOPPED, ExitStatus.INTERRUPTED); + checkRepository(BatchStatus.STOPPED, ExitStatus.FAILED); } public void testFailed() throws Exception { @@ -355,7 +355,7 @@ public class SimpleJobTests extends TestCase { throw (RuntimeException) exception; } if (exception instanceof JobInterruptedException) { - stepExecution.setExitStatus(ExitStatus.INTERRUPTED); + stepExecution.setExitStatus(ExitStatus.FAILED); throw (JobInterruptedException) exception; } if (runnable != null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java index de02c66d1..c2afb36e6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java @@ -28,12 +28,6 @@ import org.springframework.util.StringUtils; */ public class ExitStatus implements Serializable { - /** - * Convenient constant value for when we detect that processing is underway. - * Used mainly by asynchronous launchers. - */ - public static final ExitStatus RUNNING = new ExitStatus(true, "RUNNING"); - /** * Convenient constant value representing unknown state - assumed * continuable. @@ -50,11 +44,6 @@ public class ExitStatus implements Serializable { */ public static final ExitStatus FINISHED = new ExitStatus(false, "COMPLETED"); - /** - * Convenient constant value representing interrupted processing. - */ - public static final ExitStatus INTERRUPTED = new ExitStatus(false, "INTERRUPTED"); - /** * Convenient constant value representing job that did no processing (e.g. * because it was already complete). diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java index 5cb916d24..cfbe32564 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java @@ -189,11 +189,6 @@ public class ExitStatusTests extends TestCase { assertEquals("Bar", status.getExitDescription()); } - public void testRunningIsRunning() throws Exception { - assertTrue(ExitStatus.RUNNING.isRunning()); - assertTrue(new ExitStatus(true, "RUNNING").isRunning()); - } - public void testUnkownIsRunning() throws Exception { assertTrue(ExitStatus.UNKNOWN.isRunning()); }