Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-2179: Updated to add unidentifying flag to properties as they are returned if applicable

Browse Source
This commit is contained in:
Michael Minella
2014-02-20 16:18:51 -06:00
parent cc3c7593c8
commit 3510285c8b
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2013 the original author or authors. * Copyright 2006-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -180,7 +180,10 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
/** /**
* Use the same suffixes to create properties (omitting the string suffix * Use the same suffixes to create properties (omitting the string suffix
* because it is the default). * because it is the default). Non-identifying parameters will be prefixed
* with the {@link #NON_IDENTIFYING_FLAG}. However, since parameters are
* identifying by default, they will <em>not</em> be prefixed with the
* {@link #IDENTIFYING_FLAG}.
* *
* @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters)
*/ */
@@ -199,6 +202,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
JobParameter jobParameter = entry.getValue(); JobParameter jobParameter = entry.getValue();
Object value = jobParameter.getValue(); Object value = jobParameter.getValue();
if (value != null) { if (value != null) {
key = (!jobParameter.isIdentifying()? NON_IDENTIFYING_FLAG : "") + key;
if (jobParameter.getType() == ParameterType.DATE) { if (jobParameter.getType() == ParameterType.DATE) {
synchronized (dateFormat) { synchronized (dateFormat) {
result.setProperty(key + DATE_TYPE, dateFormat.format(value)); result.setProperty(key + DATE_TYPE, dateFormat.format(value));

18
spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2013 the original author or authors. * Copyright 2006-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -281,6 +281,22 @@ public class DefaultJobParametersConverterTests {
assertEquals("1.23", props.getProperty("double.key(double)")); assertEquals("1.23", props.getProperty("double.key(double)"));
} }
@Test
public void testRoundTripWithIdentifyingAndNonIdentifying() throws Exception {
String[] args = new String[] { "schedule.date(date)=2008/01/23", "+job.key=myKey", "-vendor.id(long)=33243243",
"double.key(double)=1.23" };
JobParameters parameters = factory.getJobParameters(StringUtils.splitArrayElementsIntoProperties(args, "="));
Properties props = factory.getProperties(parameters);
assertNotNull(props);
assertEquals("myKey", props.getProperty("job.key"));
assertEquals("33243243", props.getProperty("-vendor.id(long)"));
assertEquals("2008/01/23", props.getProperty("schedule.date(date)"));
assertEquals("1.23", props.getProperty("double.key(double)"));
}
@Test @Test
public void testRoundTripWithNumberFormat() throws Exception { public void testRoundTripWithNumberFormat() throws Exception {