Merge pull request #204 from mminella/BATCH-2007

Author: mminella

spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/StepExecutionSerializationUtilsTests.java

@@ -41,7 +41,7 @@ public class StepExecutionSerializationUtilsTests {
 	@Test
 	public void testCycle() throws Exception {
 		StepExecution stepExecution = new StepExecution("step", new JobExecution(new JobInstance(123L,
-				"job"), 321L, new JobParameters()), 11L);
+				"job"), 321L, new JobParameters(), null), 11L);
 		stepExecution.getExecutionContext().put("foo.bar.spam", 123);
 		StepExecution result = getCopy(stepExecution);
 		assertEquals(stepExecution, result);
@@ -58,9 +58,10 @@ public void testMultipleCycles() throws Throwable {
 		CompletionService<StepExecution> completionService = new ExecutorCompletionService<StepExecution>(executor);
 
 		for (int i = 0; i < repeats; i++) {
-			final JobExecution jobExecution = new JobExecution(new JobInstance(123L, "job"), 321L, new JobParameters());
+			final JobExecution jobExecution = new JobExecution(new JobInstance(123L, "job"), 321L, new JobParameters(), null);
 			for (int j = 0; j < threads; j++) {
 				completionService.submit(new Callable<StepExecution>() {
+					@Override
 					public StepExecution call() throws Exception {
 						final StepExecution stepExecution = jobExecution.createStepExecution("step");
 						stepExecution.getExecutionContext().put("foo.bar.spam", 123);

spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java

@@ -62,16 +62,27 @@ public class JobExecution extends Entity {
 
 	private transient volatile List<Throwable> failureExceptions = new CopyOnWriteArrayList<Throwable>();
 
+	private final String jobConfigurationName;
+
 	/**
 	 * Because a JobExecution isn't valid unless the job is set, this
 	 * constructor is the only valid one from a modeling point of view.
 	 *
 	 * @param job the job of which this execution is a part
 	 */
-	public JobExecution(JobInstance job, Long id, JobParameters jobParameters) {
+	public JobExecution(JobInstance job, Long id, JobParameters jobParameters, String jobConfigurationName) {
 		super(id);
 		this.jobInstance = job;
 		this.jobParameters = jobParameters == null ? new JobParameters() : jobParameters;
+		this.jobConfigurationName = jobConfigurationName;
+	}
+
+	public JobExecution(JobInstance job, JobParameters jobParameters, String jobConfigurationName) {
+		this(job, null, jobParameters, jobConfigurationName);
+	}
+
+	public JobExecution(Long id, JobParameters jobParameters, String jobConfigurationName) {
+		this(null, id, jobParameters, jobConfigurationName);
 	}
 
 	/**
@@ -80,15 +91,15 @@ public JobExecution(JobInstance job, Long id, JobParameters jobParameters) {
 	 * @param job the enclosing {@link JobInstance}
 	 */
 	public JobExecution(JobInstance job, JobParameters jobParameters) {
-		this(job, null, jobParameters);
+		this(job, null, jobParameters, null);
 	}
 
 	public JobExecution(Long id, JobParameters jobParameters) {
-		this(null, id, jobParameters);
+		this(null, id, jobParameters, null);
 	}
 
 	public JobExecution(Long id) {
-		this(null, id, null);
+		this(null, id, null, null);
 	}
 
 	public JobParameters getJobParameters() {
@@ -256,6 +267,10 @@ public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
+	public String getJobConfigurationName() {
+		return this.jobConfigurationName;
+	}
+
 	/**
 	 * Package private method for re-constituting the step executions from
 	 * existing instances.

spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2013 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.
@@ -21,23 +21,25 @@
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.batch.item.ExecutionContext;
 
 /**
  * Entry point for browsing executions of running or historical jobs and steps.
  * Since the data may be re-hydrated from persistent storage, it may not contain
  * volatile fields that would have been present when the execution was active.
- * 
+ *
  * @author Dave Syer
- * 
+ * @author Michael Minella
+ *
  * @since 2.0
  */
 public interface JobExplorer {
 
 	/**
 	 * Fetch {@link JobInstance} values in descending order of creation (and
 	 * therefore usually of first execution).
-	 * 
+	 *
 	 * @param jobName the name of the job to query
 	 * @param start the start index of the instances to return
 	 * @param count the maximum number of instances to return
@@ -51,7 +53,7 @@ public interface JobExplorer {
 	 * the parent {@link JobInstance} and associated {@link ExecutionContext}
 	 * and {@link StepExecution} instances (also including their execution
 	 * contexts).
-	 * 
+	 *
 	 * @param executionId the job execution id
 	 * @return the {@link JobExecution} with this id, or null if not found
 	 */
@@ -62,11 +64,11 @@ public interface JobExplorer {
 	 * {@link JobExecution} id. The execution context for the step should be
 	 * available in the result, and the parent job execution should have its
 	 * primitive properties, but may not contain the job instance information.
-	 * 
+	 *
 	 * @param jobExecutionId the parent job execution id
 	 * @param stepExecutionId the step execution id
 	 * @return the {@link StepExecution} with this id, or null if not found
-	 * 
+	 *
 	 * @see #getJobExecution(Long)
 	 */
 	StepExecution getStepExecution(Long jobExecutionId, Long stepExecutionId);
@@ -82,7 +84,7 @@ public interface JobExplorer {
 	 * executions may not be fully hydrated (e.g. their execution context may be
 	 * missing), depending on the implementation. Use
 	 * {@link #getStepExecution(Long, Long)} to hydrate them in that case.
-	 * 
+	 *
 	 * @param jobInstance the {@link JobInstance} to query
 	 * @return the set of all executions for the specified {@link JobInstance}
 	 */
@@ -93,7 +95,7 @@ public interface JobExplorer {
 	 * not be fully hydrated (e.g. their execution context may be missing),
 	 * depending on the implementation. Use
 	 * {@link #getStepExecution(Long, Long)} to hydrate them in that case.
-	 * 
+	 *
 	 * @param jobName the name of the job
 	 * @return the set of running executions for jobs with the specified name
 	 */
@@ -102,9 +104,20 @@ public interface JobExplorer {
 	/**
 	 * Query the repository for all unique {@link JobInstance} names (sorted
 	 * alphabetically).
-	 * 
+	 *
 	 * @return the set of job names that have been executed
 	 */
 	List<String> getJobNames();
 
+	/**
+	 * Query the repository for the number of unique {@link JobInstance}s
+	 * associated with the supplied job name.
+	 *
+	 * @param jobName the name of the job to query for
+	 * @return the number of {@link JobInstance}s that exist within the
+	 * associated job repository
+	 * @throws NoSuchJobException
+	 */
+	int getJobInstanceCount(String jobName) throws NoSuchJobException;
+
 }

spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java

@@ -23,6 +23,7 @@
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.batch.core.repository.dao.ExecutionContextDao;
 import org.springframework.batch.core.repository.dao.JobExecutionDao;
 import org.springframework.batch.core.repository.dao.JobInstanceDao;
@@ -33,6 +34,7 @@
  *
  * @author Dave Syer
  * @author Lucas Ward
+ * @author Michael Minella
  *
  * @see JobExplorer
  * @see JobInstanceDao
@@ -180,6 +182,14 @@ public List<String> getJobNames() {
 		return jobInstanceDao.getJobNames();
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.core.explore.JobExplorer#getJobInstanceCount(java.lang.String)
+	 */
+	@Override
+	public int getJobInstanceCount(String jobName) throws NoSuchJobException {
+		return jobInstanceDao.getJobInstanceCount(jobName);
+	}
+
 	/*
 	 * Find all dependencies for a JobExecution, including JobInstance (which
 	 * requires JobParameters) plus StepExecutions
@@ -198,5 +208,4 @@ private void getStepExecutionDependencies(StepExecution stepExecution) {
 			stepExecution.setExecutionContext(ecDao.getExecutionContext(stepExecution));
 		}
 	}
-
 }

spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContext.java

@@ -21,6 +21,7 @@
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.converter.JobParametersConverter;
 import org.springframework.util.Assert;
 
 /**
@@ -35,56 +36,86 @@ public class JobContext implements javax.batch.runtime.context.JobContext {
 
 	private JobExecution jobExecution;
 	private Object transientUserData;
+	private JobParametersConverter jobParametersConverter;
 
 	/**
 	 * @param jobExecution for the related job
 	 */
-	public JobContext(JobExecution jobExecution) {
+	public JobContext(JobExecution jobExecution, JobParametersConverter jobParametersConverter) {
 		Assert.notNull(jobExecution, "A JobExecution is required");
+		Assert.notNull(jobParametersConverter, "A ParametersConverter is required");
 
 		this.jobExecution = jobExecution;
+		this.jobParametersConverter = jobParametersConverter;
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getJobName()
+	 */
 	@Override
 	public String getJobName() {
 		return jobExecution.getJobInstance().getJobName();
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getTransientUserData()
+	 */
 	@Override
 	public Object getTransientUserData() {
 		return transientUserData;
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#setTransientUserData(java.lang.Object)
+	 */
 	@Override
 	public void setTransientUserData(Object data) {
 		transientUserData = data;
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getInstanceId()
+	 */
 	@Override
 	public long getInstanceId() {
 		return jobExecution.getJobInstance().getId();
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getExecutionId()
+	 */
 	@Override
 	public long getExecutionId() {
 		return jobExecution.getId();
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getProperties()
+	 */
 	@Override
 	public Properties getProperties() {
-		return jobExecution.getJobParameters().toProperties();
+		return jobParametersConverter.getProperties(this.jobExecution.getJobParameters());
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getBatchStatus()
+	 */
 	@Override
 	public BatchStatus getBatchStatus() {
 		return jobExecution.getStatus().getBatchStatus();
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#getExitStatus()
+	 */
 	@Override
 	public String getExitStatus() {
 		return jobExecution.getExitStatus().getExitCode();
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.batch.runtime.context.JobContext#setExitStatus(java.lang.String)
+	 */
 	@Override
 	public void setExitStatus(String status) {
 		jobExecution.setExitStatus(new ExitStatus(status));