diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java index 5d6ead882..7ad894400 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java @@ -34,7 +34,7 @@ public interface Job { * @deprecated planned for removal in 2.0 * @return the {@link Step}s executed as part of this job. */ - List getSteps(); + List getSteps(); boolean isRestartable(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java index 84861d5f6..d0eb74c20 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java @@ -19,7 +19,6 @@ package org.springframework.batch.core; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.ExitStatus; @@ -34,7 +33,7 @@ public class JobExecution extends Entity { private final JobInstance jobInstance; - private volatile transient Collection stepExecutions = new HashSet(); + private volatile transient Collection stepExecutions = new HashSet(); private volatile BatchStatus status = BatchStatus.STARTING; @@ -131,7 +130,7 @@ public class JobExecution extends Entity { * * @return the step executions that were registered */ - public Collection getStepExecutions() { + public Collection getStepExecutions() { return stepExecutions; } @@ -177,8 +176,7 @@ public class JobExecution extends Entity { * */ public void stop() { - for (Iterator it = stepExecutions.iterator(); it.hasNext();) { - StepExecution stepExecution = (StepExecution) it.next(); + for (StepExecution stepExecution : stepExecutions) { stepExecution.setTerminateOnly(); } status = BatchStatus.STOPPING; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java index 37270e4bf..c310ba3dc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java @@ -29,13 +29,13 @@ import org.apache.commons.lang.builder.HashCodeBuilder; */ public class JobParameters implements Serializable { - private final Map stringMap; + private final Map stringMap; - private final Map longMap; + private final Map longMap; - private final Map doubleMap; + private final Map doubleMap; - private final Map dateMap; + private final Map dateMap; /** * Default constructor. Creates a new empty JobRuntimeParameters. It should @@ -43,10 +43,10 @@ public class JobParameters implements Serializable { * is needed, since JobRuntimeParameters is immutable. */ public JobParameters() { - this.stringMap = new LinkedHashMap(); - this.longMap = new LinkedHashMap(); - this.doubleMap = new LinkedHashMap(); - this.dateMap = new LinkedHashMap(); + this.stringMap = new LinkedHashMap(); + this.longMap = new LinkedHashMap(); + this.doubleMap = new LinkedHashMap(); + this.dateMap = new LinkedHashMap(); } /** @@ -54,16 +54,17 @@ public class JobParameters implements Serializable { * supported data types. See {@link JobParametersBuilder} for an easier way * to create parameters. */ - public JobParameters(Map stringMap, Map longMap, Map doubleMap, Map dateMap) { + public JobParameters(Map stringMap, Map longMap, Map doubleMap, + Map dateMap) { super(); validateMap(stringMap, String.class); validateMap(longMap, Long.class); validateMap(doubleMap, Double.class); validateMap(dateMap, Date.class); - this.stringMap = new LinkedHashMap(stringMap); - this.longMap = new LinkedHashMap(longMap); - this.doubleMap = new LinkedHashMap(doubleMap); + this.stringMap = new LinkedHashMap(stringMap); + this.longMap = new LinkedHashMap(longMap); + this.doubleMap = new LinkedHashMap(doubleMap); this.dateMap = copyDateMap(dateMap); } @@ -114,8 +115,8 @@ public class JobParameters implements Serializable { * * @return an unmodifiable map containing all parameters. */ - public Map getParameters() { - Map tempMap = new LinkedHashMap(stringMap); + public Map getParameters() { + Map tempMap = new LinkedHashMap(stringMap); tempMap.putAll(longMap); tempMap.putAll(doubleMap); tempMap.putAll(dateMap); @@ -127,7 +128,7 @@ public class JobParameters implements Serializable { * * @return String parameters. */ - public Map getStringParameters() { + public Map getStringParameters() { return Collections.unmodifiableMap(stringMap); } @@ -136,7 +137,7 @@ public class JobParameters implements Serializable { * * @return long parameters. */ - public Map getLongParameters() { + public Map getLongParameters() { return Collections.unmodifiableMap(longMap); } @@ -145,7 +146,7 @@ public class JobParameters implements Serializable { * * @return long parameters. */ - public Map getDoubleParameters() { + public Map getDoubleParameters() { return Collections.unmodifiableMap(doubleMap); } @@ -154,7 +155,7 @@ public class JobParameters implements Serializable { * * @return date parameters. */ - public Map getDateParameters() { + public Map getDateParameters() { return Collections.unmodifiableMap(dateMap); } @@ -169,6 +170,8 @@ public class JobParameters implements Serializable { * Convenience method for validating that a the provided map only contains a * particular type as a value, with only a String as a key. */ + + @SuppressWarnings("unchecked") private void validateMap(Map map, Class type) { for (Iterator it = map.entrySet().iterator(); it.hasNext();) { @@ -186,13 +189,11 @@ public class JobParameters implements Serializable { /* * Convenience method for copying Date values to ensure immutability. */ - private Map copyDateMap(Map dateMap) { - Map tempMap = new LinkedHashMap(); + private Map copyDateMap(Map dateMap) { + Map tempMap = new LinkedHashMap(); - for (Iterator it = dateMap.entrySet().iterator(); it.hasNext();) { - Entry entry = (Entry) it.next(); - Date date = (Date) entry.getValue(); - tempMap.put(entry.getKey(), new Date(date.getTime())); + for (Entry entry : dateMap.entrySet()) { + tempMap.put(entry.getKey(), new Date(entry.getValue().getTime())); } return tempMap; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java index d6f175e60..493336316 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java @@ -23,23 +23,23 @@ import org.springframework.util.Assert; */ public class JobParametersBuilder { - private final Map stringMap; + private final Map stringMap; - private final Map longMap; + private final Map longMap; - private final Map doubleMap; + private final Map doubleMap; - private final Map dateMap; + private final Map dateMap; /** * Default constructor. Initializes the builder */ public JobParametersBuilder() { - this.stringMap = new LinkedHashMap(); - this.longMap = new LinkedHashMap(); - this.doubleMap = new LinkedHashMap(); - this.dateMap = new LinkedHashMap(); + this.stringMap = new LinkedHashMap(); + this.longMap = new LinkedHashMap(); + this.doubleMap = new LinkedHashMap(); + this.dateMap = new LinkedHashMap(); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java index b2251a745..841d79759 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java @@ -31,5 +31,5 @@ public interface ListableJobRegistry extends JobRegistry { * * @return a collection of String. Empty if none are registered. */ - Collection getJobNames(); + Collection getJobNames(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java index 28634cf9b..7583fa517 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java @@ -25,7 +25,6 @@ import org.apache.commons.lang.SerializationUtils; import org.springframework.batch.core.step.StepSupport; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.support.PropertiesConverter; /** * @author Dave Syer @@ -37,11 +36,14 @@ public class StepExecutionTests extends TestCase { private StepExecution blankExecution = newStepExecution(new StepSupport("blank"), null); - private ExecutionContext foobarEc = new ExecutionContext() { - { - put("foo", "bar"); - } - }; + private ExecutionContext foobarEc = new ExecutionContext(); + + + + @Override + protected void setUp() throws Exception { + foobarEc.put("foo", "bar"); + } public void testStepExecution() { assertNull(new StepExecution("step", null).getId());