IN PROGRESS - BATCH-709: Change all collections to use generics

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java

@@ -37,14 +37,14 @@ public class ExecutionContext implements Serializable {
 
 	private boolean dirty = false;
 
-	private final Map<Object, Object> map;
+	private final Map<String, Object> map;
 
 	/**
 	 * Default constructor. Initializes a new execution context with an empty
 	 * internal map.
 	 */
 	public ExecutionContext() {
-		map = new HashMap<Object, Object>();
+		map = new HashMap<String, Object>();
 	}
 
 	/**
@@ -52,7 +52,7 @@ public class ExecutionContext implements Serializable {
 	 * 
 	 * @param map Initial contents of context.
 	 */
-	public ExecutionContext(Map<Object, Object> map) {
+	public ExecutionContext(Map<String, Object> map) {
 		this.map = map;
 	}
 
@@ -64,7 +64,7 @@ public class ExecutionContext implements Serializable {
 		if (executionContext == null) {
 			return;
 		}
-		for (Entry<Object, Object> entry : executionContext.entrySet()) {
+		for (Entry<String, Object> entry : executionContext.entrySet()) {
 			this.map.put(entry.getKey(), entry.getValue());
 		}
 	}
@@ -265,7 +265,7 @@ public class ExecutionContext implements Serializable {
 	 * @return A set representing the contents of the context
 	 * @see java.util.Map#entrySet()
 	 */
-	public Set<Entry<Object, Object>> entrySet() {
+	public Set<Entry<String, Object>> entrySet() {
 		return map.entrySet();
 	}
 
@@ -302,8 +302,8 @@ public class ExecutionContext implements Serializable {
 	 */
 	public Properties getProperties() {
 		Properties props = new Properties();
-		for (Entry<Object, Object> entry : map.entrySet()) {
-			props.setProperty(entry.getKey().toString(), entry.getValue().toString());
+		for (Entry<String, Object> entry : map.entrySet()) {
+			props.setProperty(entry.getKey(), entry.getValue().toString());
 		}
 
 		return props;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java

@@ -19,7 +19,6 @@ package org.springframework.batch.item.file.mapping;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -86,7 +85,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar im
 
 	private BeanFactory beanFactory;
 
-	private static Map propertiesMatched = new HashMap();
+	private static Map<Class<?>, Map<String, String>> propertiesMatched = new HashMap<Class<?>, Map<String, String>>();
 
 	private static int distanceLimit = 5;
 
@@ -126,7 +125,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar im
 	 * 
 	 * @param type the type to set
 	 */
-	public void setTargetType(Class type) {
+	public void setTargetType(Class<?> type) {
 		this.type = type;
 	}
 
@@ -227,23 +226,23 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar im
 	 * @param properties
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	private Properties getBeanProperties(Object bean, Properties properties) {
 
-		Class cls = bean.getClass();
+		Class<?> cls = bean.getClass();
 
 		// Map from field names to property names
-		Map matches = (Map) propertiesMatched.get(cls);
+		Map<String, String> matches = propertiesMatched.get(cls);
 		if (matches == null) {
-			matches = new HashMap();
+			matches = new HashMap<String, String>();
 			propertiesMatched.put(cls, matches);
 		}
 
-		Set keys = new HashSet(properties.keySet());
-		for (Iterator iter = keys.iterator(); iter.hasNext();) {
-			String key = (String) iter.next();
+		Set<String> keys = new HashSet(properties.keySet());
+		for (String key : keys) {
 
 			if (matches.containsKey(key)) {
-				switchPropertyNames(properties, key, (String) matches.get(key));
+				switchPropertyNames(properties, key, matches.get(key));
 				continue;
 			}
 
@@ -260,7 +259,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar im
 
 	private String findPropertyName(Object bean, String key) {
 
-		Class cls = bean.getClass();
+		Class<?> cls = bean.getClass();
 
 		int index = PropertyAccessorUtils.getFirstNestedPropertySeparatorIndex(key);
 		String prefix;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java

@@ -128,7 +128,7 @@ public class DrivingQueryItemReaderTests extends TestCase {
 	 * @throws Exception
 	 */
 	public void testRestoreFromEmptyData() throws Exception {
-		ExecutionContext streamContext = new ExecutionContext(new Properties());
+		ExecutionContext streamContext = new ExecutionContext(new ExecutionContext());
 
 		getAsItemStream(itemReader).open(streamContext);
 
@@ -201,11 +201,9 @@ public class DrivingQueryItemReaderTests extends TestCase {
 		static final String RESTART_KEY = "restart.keys";
 
 		static {
-			Properties props = new Properties();
 			// restart data properties cannot be empty.
-			props.setProperty("", "");
-
-			streamContext = new ExecutionContext(props);
+			streamContext = new ExecutionContext();
+			streamContext.put("", "");
 		}
 
 		public MockKeyGenerator() {