From 5d57ea2f0f49d48cfcbcc1989dc3a850bc5a1ba5 Mon Sep 17 00:00:00 2001 From: robokaso Date: Wed, 16 Jul 2008 08:55:46 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../ScheduledJobParametersFactory.java | 11 ++-- .../support/SimpleExportedJobLauncher.java | 61 +++++++++++-------- .../support/SimpleJvmExitCodeMapper.java | 8 +-- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java index e6a69e06a..65bbb0670 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java @@ -19,7 +19,6 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.Map.Entry; @@ -51,8 +50,7 @@ public class ScheduledJobParametersFactory implements JobParametersConverter { JobParametersBuilder propertiesBuilder = new JobParametersBuilder(); - for (Iterator it = props.entrySet().iterator(); it.hasNext();) { - Entry entry = (Entry) it.next(); + for (Entry entry : props.entrySet()) { if (entry.getKey().equals(SCHEDULE_DATE_KEY)) { Date scheduleDate; try { @@ -80,11 +78,10 @@ public class ScheduledJobParametersFactory implements JobParametersConverter { return new Properties(); } - Map parameters = params.getParameters(); + Map parameters = params.getParameters(); Properties result = new Properties(); - for (Iterator iterator = parameters.entrySet().iterator(); iterator.hasNext();) { - Entry entry = (Entry) iterator.next(); - String key = (String) entry.getKey(); + for (Entry entry : parameters.entrySet()) { + String key = entry.getKey(); if (key.equals(SCHEDULE_DATE_KEY)) { result.setProperty(key, dateFormat.format(entry.getValue())); } else { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java index 23d5fabea..f58f189aa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java @@ -16,7 +16,6 @@ package org.springframework.batch.core.launch.support; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.Map.Entry; @@ -46,12 +45,15 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ private JobLocator jobLocator; - private Map registry = new HashMap(); + private Map registry = new HashMap(); private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter(); - - /* (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() + + /* + * (non-Javadoc) + * + * @see + * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ public void afterPropertiesSet() throws Exception { Assert.notNull(launcher, "JobLauncher must be provided."); @@ -65,7 +67,7 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ public void setLauncher(JobLauncher launcher) { this.launcher = launcher; } - + /** * Public setter for the JobLocator. * @param jobLocator the jobLocator to set @@ -73,7 +75,7 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ public void setJobLocator(JobLocator jobLocator) { this.jobLocator = jobLocator; } - + /** * Public setter for the JobParametersFactory. * @param jobParametersConverter the jobParametersFactory to set @@ -84,13 +86,15 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ /* * (non-Javadoc) - * @see org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher#getStatistics() + * + * @see + * org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher + * #getStatistics() */ public Properties getStatistics() { Properties result = new Properties(); int i = 0; - for (Iterator iterator = registry.keySet().iterator(); iterator.hasNext();) { - String key = (String) iterator.next(); + for (String key : registry.keySet()) { JobExecution execution = (JobExecution) registry.get(key); addStatistics(result, execution, "job" + i + "."); i++; @@ -104,23 +108,23 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ */ private void addStatistics(Properties result, JobExecution execution, String prefix) { int i = 0; - for (Iterator iterator = execution.getStepExecutions().iterator(); iterator.hasNext();) { - StepExecution stepExecution = (StepExecution) iterator.next(); - ExecutionContext statistics = stepExecution.getExecutionContext(); - for (Iterator iter = statistics.entrySet().iterator(); iter.hasNext();) { - Entry entry = (Entry) iter.next(); - result.setProperty(prefix + "step" + i + "." + entry.getKey(), ""+entry.getValue()); + for (StepExecution stepExecution : execution.getStepExecutions()) { + ExecutionContext executionContext = stepExecution.getExecutionContext(); + for (Entry entry : executionContext.entrySet()) { + result.setProperty(prefix + "step" + i + "." + entry.getKey(), "" + entry.getValue()); } } } /* * (non-Javadoc) - * @see org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher#isRunning() + * + * @see + * org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher + * #isRunning() */ public boolean isRunning() { - for (Iterator iterator = registry.keySet().iterator(); iterator.hasNext();) { - String key = (String) iterator.next(); + for (String key : registry.keySet()) { JobExecution execution = (JobExecution) registry.get(key); if (execution.isRunning()) { return true; @@ -131,7 +135,10 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ /* * (non-Javadoc) - * @see org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher#run(java.lang.String) + * + * @see + * org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher + * #run(java.lang.String) */ public String run(String name) { return run(name, null); @@ -139,8 +146,10 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ /* * (non-Javadoc) - * @see org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher#run(java.lang.String, - * java.lang.String) + * + * @see + * org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher + * #run(java.lang.String, java.lang.String) */ public String run(String name, String params) { @@ -172,11 +181,13 @@ public class SimpleExportedJobLauncher implements ExportedJobLauncher, Initializ /* * (non-Javadoc) - * @see org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher#stop() + * + * @see + * org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher + * #stop() */ public void stop() { - for (Iterator iterator = registry.keySet().iterator(); iterator.hasNext();) { - String key = (String) iterator.next(); + for (String key : registry.keySet()) { JobExecution execution = (JobExecution) registry.get(key); execution.stop(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java index f0d577b02..36e12f557 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java @@ -37,17 +37,17 @@ public class SimpleJvmExitCodeMapper implements ExitCodeMapper { protected Log logger = LogFactory.getLog(getClass()); - private Map mapping; + private Map mapping; public SimpleJvmExitCodeMapper() { - mapping = new HashMap(); + mapping = new HashMap(); mapping.put(ExitStatus.FINISHED.getExitCode(), new Integer(JVM_EXITCODE_COMPLETED)); mapping.put(ExitStatus.FAILED.getExitCode(), new Integer(JVM_EXITCODE_GENERIC_ERROR)); mapping.put(ExitCodeMapper.JOB_NOT_PROVIDED, new Integer(JVM_EXITCODE_JOB_ERROR)); mapping.put(ExitCodeMapper.NO_SUCH_JOB, new Integer(JVM_EXITCODE_JOB_ERROR)); } - public Map getMapping() { + public Map getMapping() { return mapping; } @@ -56,7 +56,7 @@ public class SimpleJvmExitCodeMapper implements ExitCodeMapper { * @param exitCodeMap A set of mappings between environment specific exit * codes and batch framework internal exit codes */ - public void setMapping(Map exitCodeMap) { + public void setMapping(Map exitCodeMap) { mapping.putAll(exitCodeMap); }