diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java index 686cdab8b..b03b7b750 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java @@ -36,11 +36,11 @@ public interface JobIdentifier { public String getName(); /** - * A simple getter for the {@link JobRuntimeParameters} that also identify + * A simple getter for the {@link JobInstanceProperties} that also identify * this job. * * @return JobRuntimeParameters */ - public JobRuntimeParameters getRuntimeParameters(); + public JobInstanceProperties getRuntimeParameters(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java index 11ec7f987..a3dfadded 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java @@ -39,7 +39,7 @@ public class JobInstance extends Entity { private BatchStatus status; private int jobExecutionCount; - + /** * Package private constructor for Hibernate use only */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParameters.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java similarity index 83% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParameters.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java index 2f2d52d91..8edb5c03e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParameters.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java @@ -25,7 +25,7 @@ import org.springframework.util.Assert; * @author Lucas Ward * @since 1.0 */ -public class JobRuntimeParameters { +public class JobInstanceProperties { private final Map stringMap; @@ -38,7 +38,7 @@ public class JobRuntimeParameters { * that this constructor should only be used if an empty parameters is needed, since * JobRuntimeParameters is immutable. */ - public JobRuntimeParameters(){ + public JobInstanceProperties(){ this.stringMap = new HashMap(); this.longMap = new HashMap(); this.dateMap = new HashMap(); @@ -46,14 +46,14 @@ public class JobRuntimeParameters { /** * Create a new parameters object based upon three maps for each of the three - * data types. See {@link JobRuntimeParametersBuilder} for an easier way to + * data types. See {@link JobInstancePropertiesBuilder} for an easier way to * create paramters. * * @param stringMap * @param longMap * @param dateMap */ - public JobRuntimeParameters(Map stringMap, Map longMap, Map dateMap){ + public JobInstanceProperties(Map stringMap, Map longMap, Map dateMap){ super(); validateMap(stringMap, String.class); @@ -107,6 +107,33 @@ public class JobRuntimeParameters { return Collections.unmodifiableMap(tempMap); } + /** + * Get a map of only string parameters. + * + * @return String parameters. + */ + public Map getStringParameters(){ + return Collections.unmodifiableMap(stringMap); + } + + /** + * Get a map of only Long parameters + * + * @return long parameters. + */ + public Map getLongParameters(){ + return Collections.unmodifiableMap(longMap); + } + + /** + * Get a map of only Date parameters + * + * @return date parameters. + */ + public Map getDateParameters(){ + return Collections.unmodifiableMap(dateMap); + } + /* * Convenience method for validating that a the provided map only contains a particular * type as a value, with only a String as a key. @@ -143,7 +170,7 @@ public class JobRuntimeParameters { public boolean equals(Object obj) { - if(obj instanceof JobRuntimeParameters == false){ + if(obj instanceof JobInstanceProperties == false){ return false; } @@ -151,7 +178,7 @@ public class JobRuntimeParameters { return true; } - JobRuntimeParameters parameters = (JobRuntimeParameters)obj; + JobInstanceProperties parameters = (JobInstanceProperties)obj; //Since the type contained by each map is known, it's safe to call Map.equals() if(getParameters().equals(parameters.getParameters())){ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilder.java similarity index 81% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilder.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilder.java index aafbee3cf..de0009db9 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilder.java @@ -17,9 +17,9 @@ import org.springframework.util.Assert; * * @author Lucas Ward * @since 1.0 - * @see JobRuntimeParameters + * @see JobInstanceProperties */ -public class JobRuntimeParametersBuilder { +public class JobInstancePropertiesBuilder { private final Map stringMap; @@ -30,7 +30,7 @@ public class JobRuntimeParametersBuilder { /** * Default constructor. Initializes the builder */ - public JobRuntimeParametersBuilder() { + public JobInstancePropertiesBuilder() { this.stringMap = new HashMap(); this.longMap = new HashMap(); @@ -44,7 +44,7 @@ public class JobRuntimeParametersBuilder { * @param parameter - runtime parameter * @return a refernece to this object. */ - public JobRuntimeParametersBuilder addString(String key, String parameter){ + public JobInstancePropertiesBuilder addString(String key, String parameter){ Assert.notNull(parameter, "Parameter must not be null."); stringMap.put(key, parameter); return this; @@ -57,7 +57,7 @@ public class JobRuntimeParametersBuilder { * @param parameter - runtime parameter * @return a refernece to this object. */ - public JobRuntimeParametersBuilder addDate(String key, Date parameter){ + public JobInstancePropertiesBuilder addDate(String key, Date parameter){ Assert.notNull(parameter, "Parameter must not be null."); dateMap.put(key, new Date(parameter.getTime())); return this; @@ -70,7 +70,7 @@ public class JobRuntimeParametersBuilder { * @param parameter - runtime parameter * @return a refernece to this object. */ - public JobRuntimeParametersBuilder addLong(String key, Long parameter){ + public JobInstancePropertiesBuilder addLong(String key, Long parameter){ Assert.notNull(parameter, "Parameter must not be null."); longMap.put(key, parameter); return this; @@ -82,7 +82,7 @@ public class JobRuntimeParametersBuilder { * * @return a valid JobRuntimeParameters object. */ - public JobRuntimeParameters toJobRuntimeParameters(){ - return new JobRuntimeParameters(stringMap, longMap, dateMap); + public JobInstanceProperties toJobParameters(){ + return new JobInstanceProperties(stringMap, longMap, dateMap); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java index 0df4232b0..b652f8773 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java @@ -18,7 +18,7 @@ package org.springframework.batch.core.runtime; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.springframework.batch.core.domain.JobIdentifier; -import org.springframework.batch.core.domain.JobRuntimeParameters; +import org.springframework.batch.core.domain.JobInstanceProperties; import org.springframework.util.ClassUtils; @@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils; public class SimpleJobIdentifier implements JobIdentifier { private String name; - private JobRuntimeParameters runtimeParameters; + private JobInstanceProperties runtimeParameters; /** * Default constructor. Since there it is required that the Identifier at least have a name, @@ -47,10 +47,10 @@ public class SimpleJobIdentifier implements JobIdentifier { * @param name */ public SimpleJobIdentifier(String name) { - this(name, new JobRuntimeParameters()); + this(name, new JobInstanceProperties()); } - public SimpleJobIdentifier(String name, JobRuntimeParameters runtimeParameters){ + public SimpleJobIdentifier(String name, JobInstanceProperties runtimeParameters){ this.name = name; this.runtimeParameters = runtimeParameters; } @@ -62,7 +62,7 @@ public class SimpleJobIdentifier implements JobIdentifier { return this.name; } - public JobRuntimeParameters getRuntimeParameters() { + public JobInstanceProperties getRuntimeParameters() { return runtimeParameters; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilderTests.java similarity index 72% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilderTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilderTests.java index 79557f4be..b5aed8c71 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesBuilderTests.java @@ -11,16 +11,16 @@ import junit.framework.TestCase; * @author Lucas Ward * */ -public class JobRuntimeParametersBuilderTests extends TestCase { +public class JobInstancePropertiesBuilderTests extends TestCase { - JobRuntimeParametersBuilder parametersBuilder; + JobInstancePropertiesBuilder parametersBuilder; Date date = new Date(System.currentTimeMillis()); protected void setUp() throws Exception { super.setUp(); - parametersBuilder = new JobRuntimeParametersBuilder(); + parametersBuilder = new JobInstancePropertiesBuilder(); parametersBuilder.addDate("SCHEDULE_DATE", date); parametersBuilder.addLong("LONG", new Long(1)); parametersBuilder.addString("STRING", "string value"); @@ -28,7 +28,7 @@ public class JobRuntimeParametersBuilderTests extends TestCase { public void testToJobRuntimeParamters(){ - JobRuntimeParameters parameters = parametersBuilder.toJobRuntimeParameters(); + JobInstanceProperties parameters = parametersBuilder.toJobParameters(); assertEquals(parameters.getDate("SCHEDULE_DATE"), date); assertEquals(parameters.getLong("LONG"), new Long(1)); assertEquals(parameters.getString("STRING"), "string value"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java similarity index 80% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java index 5967c8978..062e849d4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobRuntimeParametersTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java @@ -13,9 +13,9 @@ import junit.framework.TestCase; * @author Lucas Ward * */ -public class JobRuntimeParametersTests extends TestCase { +public class JobInstancePropertiesTests extends TestCase { - JobRuntimeParameters parameters; + JobInstanceProperties parameters; Map stringMap; @@ -31,7 +31,7 @@ public class JobRuntimeParametersTests extends TestCase { parameters = getNewParameters(); } - private JobRuntimeParameters getNewParameters(){ + private JobInstanceProperties getNewParameters(){ stringMap = new HashMap(); stringMap.put("string.key1", "value1"); @@ -45,7 +45,7 @@ public class JobRuntimeParametersTests extends TestCase { dateMap.put("date.key1", date1 ); dateMap.put("date.key2", date2 ); - return new JobRuntimeParameters(stringMap, longMap, dateMap); + return new JobInstanceProperties(stringMap, longMap, dateMap); } public void testBadLongConstructorException() throws Exception{ @@ -54,7 +54,7 @@ public class JobRuntimeParametersTests extends TestCase { badLongMap.put("key", "bad long"); try{ - JobRuntimeParameters testParameters = new JobRuntimeParameters(stringMap, badLongMap, dateMap); + JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, badLongMap, dateMap); fail(); } catch(IllegalArgumentException ex){ @@ -68,7 +68,7 @@ public class JobRuntimeParametersTests extends TestCase { badMap.put("key", new Integer(2)); try{ - JobRuntimeParameters testParameters = new JobRuntimeParameters(badMap, longMap, dateMap); + JobInstanceProperties testParameters = new JobInstanceProperties(badMap, longMap, dateMap); fail(); } catch(IllegalArgumentException ex){ @@ -82,7 +82,7 @@ public class JobRuntimeParametersTests extends TestCase { badMap.put("key", new java.sql.Date(System.currentTimeMillis())); try{ - JobRuntimeParameters testParameters = new JobRuntimeParameters(stringMap, longMap, badMap); + JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, longMap, badMap); fail(); } catch(IllegalArgumentException ex){ @@ -110,7 +110,7 @@ public class JobRuntimeParametersTests extends TestCase { public void testEquals(){ - JobRuntimeParameters testParameters = getNewParameters(); + JobInstanceProperties testParameters = getNewParameters(); assertTrue(testParameters.equals(parameters)); }