Merge pull request #198 from mminella/BATCH-2004

* BATCH-2004:
  BATCH-2004: Updated per review comments
  BATCH-2004: Added basic wrappers for the the majority of batch artifacts.

Author: mminella

spring-batch-core-tests/pom.xml

@@ -152,11 +152,6 @@
 			<artifactId>cglib-nodep</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-		    <groupId>com.ibm.jbatch</groupId>
-		    <artifactId>com.ibm.jbatch-tck-spi</artifactId>
-		    <version>1.0-b28</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>

spring-batch-core/pom.xml

@@ -21,7 +21,12 @@
 		<dependency>
 		    <groupId>javax.batch</groupId>
 		    <artifactId>javax.batch-api</artifactId>
-		    <version>1.0-b29</version>
+		    <version>1.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.ibm.jbatch</groupId>
+		    <artifactId>com.ibm.jbatch-tck-spi</artifactId>
+		    <version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -204,7 +209,7 @@
 									<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
 									<mapper type="glob" from="*.sql.vpp" to="*-sqlf.sql" />
 								</vppcopy>
-								
+
 								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
 									<config>
 										<context>

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

@@ -21,6 +21,7 @@
  * 
  * @author Lucas Ward
  * @author Dave Syer
+ * @author Michael Minella
  */
 public enum BatchStatus {
 
@@ -76,8 +77,9 @@ public BatchStatus upgradeTo(BatchStatus other) {
 			return max(this, other);
 		}
 		// Both less than or equal to STARTED
-		if (this == COMPLETED || other == COMPLETED)
+		if (this == COMPLETED || other == COMPLETED) {
 			return COMPLETED;
+		}
 		return max(this, other);
 	}
 
@@ -105,6 +107,29 @@ public boolean isLessThanOrEqualTo(BatchStatus other) {
 		return this.compareTo(other) <= 0;
 	}
 
+	/**
+	 * Converts the current status to the JSR-352 equivalent
+	 * 
+	 * @return JSR-352 equivalent to the current status
+	 */
+	public javax.batch.runtime.BatchStatus getBatchStatus() {
+		if(this == ABANDONED) {
+			return javax.batch.runtime.BatchStatus.ABANDONED;
+		} else if(this == COMPLETED) {
+			return javax.batch.runtime.BatchStatus.COMPLETED;
+		} else if(this == STARTED) {
+			return javax.batch.runtime.BatchStatus.STARTED;
+		} else if(this == STARTING) {
+			return javax.batch.runtime.BatchStatus.STARTING;
+		} else if(this == STOPPED) {
+			return javax.batch.runtime.BatchStatus.STOPPED;
+		} else if(this == STOPPING) {
+			return javax.batch.runtime.BatchStatus.STOPPING;
+		} else {
+			return javax.batch.runtime.BatchStatus.FAILED;
+		}
+	}
+
 	/**
 	 * Find a BatchStatus that matches the beginning of the given value. If no
 	 * match is found, return COMPLETED as the default because has is low

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

@@ -30,6 +30,7 @@
  * @see Job
  * @see JobParameters
  * @see JobExecution
+ * @see javax.batch.runtime.JobInstance
  *
  * @author Lucas Ward
  * @author Dave Syer
@@ -38,7 +39,7 @@
  *
  */
 @SuppressWarnings("serial")
-public class JobInstance extends Entity {
+public class JobInstance extends Entity implements javax.batch.runtime.JobInstance{
 
 	private final String jobName;
 
@@ -51,6 +52,7 @@ public JobInstance(Long id, String jobName) {
 	/**
 	 * @return the job name. (Equivalent to getJob().getName())
 	 */
+	@Override
 	public String getJobName() {
 		return jobName;
 	}
@@ -60,4 +62,8 @@ public String toString() {
 		return super.toString() + ", Job=[" + jobName + "]";
 	}
 
+	@Override
+	public long getInstanceId() {
+		return super.getId();
+	}
 }

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

@@ -20,6 +20,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Value object representing runtime parameters to a batch job. Because the
@@ -209,4 +210,16 @@ public int hashCode() {
 	public String toString() {
 		return parameters.toString();
 	}
+
+	public Properties toProperties() {
+		Properties props = new Properties();
+
+		for (Map.Entry<String, JobParameter> param : parameters.entrySet()) {
+			if(param.getValue() != null) {
+				props.put(param.getKey(), param.getValue().toString());
+			}
+		}
+
+		return props;
+	}
 }

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

@@ -19,6 +19,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import org.springframework.util.Assert;
 
@@ -58,6 +59,22 @@ public JobParametersBuilder(JobParameters jobParameters) {
 		this.parameterMap = new LinkedHashMap<String, JobParameter>(jobParameters.getParameters());
 	}
 
+	/**
+	 * Constructor to add conversion capabilities to support JSR-352.  Per the spec, it is expected that all
+	 * keys and values in the provided {@link Properties} instance are Strings
+	 *
+	 * @param properties the job parameters to be used
+	 */
+	public JobParametersBuilder(Properties properties) {
+		this.parameterMap = new LinkedHashMap<String, JobParameter>();
+
+		if(properties != null) {
+			for (Map.Entry<Object, Object> curProperty : properties.entrySet()) {
+				this.parameterMap.put((String) curProperty.getKey(), new JobParameter((String) curProperty.getValue(), false));
+			}
+		}
+	}
+
 	/**
 	 * Add a new identifying String parameter for the given key.
 	 *

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java

@@ -33,6 +33,11 @@
 import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.job.flow.Flow;
+import org.springframework.batch.core.jsr.ChunkListenerAdapter;
+import org.springframework.batch.core.jsr.ItemProcessListenerAdapter;
+import org.springframework.batch.core.jsr.ItemReadListenerAdapter;
+import org.springframework.batch.core.jsr.ItemWriteListenerAdapter;
+import org.springframework.batch.core.jsr.StepListenerAdapter;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.partition.PartitionHandler;
 import org.springframework.batch.core.partition.support.Partitioner;
@@ -85,6 +90,7 @@
  *
  * @author Dan Garrette
  * @author Josh Long
+ * @author Michael Minella
  * @see SimpleStepFactoryBean
  * @see FaultTolerantStepFactoryBean
  * @see TaskletStep
@@ -111,7 +117,7 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAwa
 
 	private PlatformTransactionManager transactionManager;
 
-	private Set<StepExecutionListener> stepExecutionListeners = new LinkedHashSet<StepExecutionListener>();
+	private Set<Object> stepExecutionListeners = new LinkedHashSet<Object>();
 
 	//
 	// Flow Elements
@@ -218,8 +224,6 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAwa
 
 	private StepExecutionAggregator stepExecutionAggregator;
 
-	private StepListener[] listeners;
-
 	/**
 	 * Create a {@link Step} from the configuration provided.
 	 *
@@ -269,8 +273,12 @@ private void enhanceCommonStep(StepBuilderHelper<?> builder) {
 		}
 		builder.repository(jobRepository);
 		builder.transactionManager(transactionManager);
-		for (StepExecutionListener listener : stepExecutionListeners) {
-			builder.listener(listener);
+		for (Object listener : stepExecutionListeners) {
+			if(listener instanceof StepExecutionListener) {
+				builder.listener((StepExecutionListener) listener);
+			} else if(listener instanceof StepListener) {
+				builder.listener(new StepListenerAdapter((javax.batch.api.listener.StepListener) listener));
+			}
 		}
 	}
 
@@ -394,7 +402,7 @@ private Step createSimpleStep() {
 			CompositeCompletionPolicy completionPolicy = new CompositeCompletionPolicy();
 			CompletionPolicy [] policies = new CompletionPolicy[2];
 			policies[0] = new SimpleCompletionPolicy(commitInterval);
-			policies[1] = new TimeoutTerminationPolicy(timeout);
+			policies[1] = new TimeoutTerminationPolicy(timeout * 1000);
 			completionPolicy.setPolicies(policies);
 			builder.chunk(completionPolicy);
 		} else if(timeout != null) {
@@ -715,37 +723,54 @@ public void setTransactionManager(PlatformTransactionManager transactionManager)
 	 *
 	 * @param listeners an array of listeners
 	 */
-	public void setListeners(StepListener[] listeners) {
-		this.listeners = listeners; // useful for testing
-		for (StepListener listener : listeners) {
+	@SuppressWarnings("unchecked")
+	public void setListeners(Object[] listeners) {
+		//		this.listeners = listeners; // useful for testing
+		for (Object listener : listeners) {
 			if (listener instanceof SkipListener) {
-				@SuppressWarnings("unchecked")
 				SkipListener<I, O> skipListener = (SkipListener<I, O>) listener;
 				skipListeners.add(skipListener);
 			}
 			if (listener instanceof StepExecutionListener) {
 				StepExecutionListener stepExecutionListener = (StepExecutionListener) listener;
 				stepExecutionListeners.add(stepExecutionListener);
 			}
+			if(listener instanceof javax.batch.api.listener.StepListener) {
+				StepExecutionListener stepExecutionListener = new StepListenerAdapter((javax.batch.api.listener.StepListener) listener);
+				stepExecutionListeners.add(stepExecutionListener);
+			}
 			if (listener instanceof ChunkListener) {
 				ChunkListener chunkListener = (ChunkListener) listener;
 				chunkListeners.add(chunkListener);
 			}
+			if(listener instanceof javax.batch.api.chunk.listener.ChunkListener) {
+				ChunkListener chunkListener = new ChunkListenerAdapter((javax.batch.api.chunk.listener.ChunkListener) listener);
+				chunkListeners.add(chunkListener);
+			}
 			if (listener instanceof ItemReadListener) {
-				@SuppressWarnings("unchecked")
 				ItemReadListener<I> readListener = (ItemReadListener<I>) listener;
 				readListeners.add(readListener);
 			}
+			if(listener instanceof javax.batch.api.chunk.listener.ItemReadListener) {
+				ItemReadListener itemListener = new ItemReadListenerAdapter((javax.batch.api.chunk.listener.ItemReadListener) listener);
+				readListeners.add(itemListener);
+			}
 			if (listener instanceof ItemWriteListener) {
-				@SuppressWarnings("unchecked")
 				ItemWriteListener<O> writeListener = (ItemWriteListener<O>) listener;
 				writeListeners.add(writeListener);
 			}
+			if(listener instanceof javax.batch.api.chunk.listener.ItemWriteListener) {
+				ItemWriteListener itemListener = new ItemWriteListenerAdapter((javax.batch.api.chunk.listener.ItemWriteListener) listener);
+				writeListeners.add(itemListener);
+			}
 			if (listener instanceof ItemProcessListener) {
-				@SuppressWarnings("unchecked")
 				ItemProcessListener<I, O> processListener = (ItemProcessListener<I, O>) listener;
 				processListeners.add(processListener);
 			}
+			if(listener instanceof javax.batch.api.chunk.listener.ItemProcessListener) {
+				ItemProcessListener itemListener = new ItemProcessListenerAdapter((javax.batch.api.chunk.listener.ItemProcessListener) listener);
+				processListeners.add(itemListener);
+			}
 		}
 	}
 

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

@@ -0,0 +1,73 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.jsr;
+
+import javax.batch.operations.BatchRuntimeException;
+
+import org.springframework.batch.core.ChunkListener;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.util.Assert;
+
+/**
+ * Wrapper class to adapt the {@link javax.batch.api.chunk.listener.ChunkListener} to
+ * a {@link ChunkListener}.
+ *
+ * @author Michael Minella
+ * @since 3.0
+ */
+public class ChunkListenerAdapter implements ChunkListener {
+
+	private final javax.batch.api.chunk.listener.ChunkListener delegate;
+
+	/**
+	 * @param delegate to be called within the step chunk lifecycle
+	 */
+	public ChunkListenerAdapter(javax.batch.api.chunk.listener.ChunkListener delegate) {
+		Assert.notNull(delegate, "A ChunkListener is required");
+		this.delegate = delegate;
+	}
+
+	@Override
+	public void beforeChunk(ChunkContext context) {
+		try {
+			delegate.beforeChunk();
+		} catch (Exception e) {
+			throw new BatchRuntimeException(e);
+		}
+	}
+
+	@Override
+	public void afterChunk(ChunkContext context) {
+		try {
+			delegate.afterChunk();
+		} catch (Exception e) {
+			throw new BatchRuntimeException(e);
+		}
+	}
+
+	@Override
+	public void afterChunkError(ChunkContext context) {
+		if(context != null) {
+			try {
+				delegate.onError((Exception) context.getAttribute(ChunkListener.ROLLBACK_EXCEPTION_KEY));
+			} catch (Exception e) {
+				throw new BatchRuntimeException(e);
+			}
+		} else {
+			throw new BatchRuntimeException("Unable to retrieve causing exception due to null ChunkContext");
+		}
+	}
+}