From 0b5bad920b2a9f499d2683099fddb22c21658cc9 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Tue, 11 Feb 2014 11:36:05 -0600 Subject: [PATCH] Updated per code review --- .../batch/core/job/flow/support/SimpleFlow.java | 2 +- .../springframework/batch/core/jsr/job/flow/JsrFlowJob.java | 2 +- .../batch/core/jsr/job/flow/support/DefaultFlow.java | 2 +- .../springframework/batch/core/jsr/step/DecisionStep.java | 2 +- .../batch/core/jsr/step/DecisionStepTests.java | 5 +---- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java index b2b9e2a82..75bc03f1e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java index 8374b3ebf..8a043040a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java @@ -98,7 +98,7 @@ public class JsrFlowJob extends FlowJob { String stepName = startState.getName().substring(startState.getName().indexOf(".") + 1, startState.getName().length()); Step step = ((StepState) startState).getStep(stepName); if(step instanceof DecisionStep) { - throw new JobExecutionException("Invalid first step"); + throw new JobExecutionException("Decision step is an invalid first step"); } else { break; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java index d09ef3a37..ed5a06de5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java index 4be356f6c..3c034c17e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/DecisionStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/DecisionStepTests.java index 2e92ef395..82705ff94 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/DecisionStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/DecisionStepTests.java @@ -25,7 +25,7 @@ public class DecisionStepTests { private static ApplicationContext baseContext; - public JobExplorer jobExplorer; + private JobExplorer jobExplorer; @Before public void setUp() { @@ -107,9 +107,6 @@ public class DecisionStepTests { @Override public String decide(StepExecution[] executions) throws Exception { - for (StepExecution stepExecution : executions) { - System.err.println(stepExecution.getStepName()); - } previousStepCount = executions.length; return "next"; }