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

OPEN - issue BATCH-1108: Add composite ItemWriter/Processor based on Classifier

Browse Source 
Move test case over from core as well
This commit is contained in:
dsyer
2009-03-03 12:23:59 +00:00
parent 998f6f592e
commit 9fa730100c
3 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java
View File

@@ -74,12 +74,8 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar {
throw new IllegalArgumentException("Invalid key [" + key
+ "] for custom editor: needs to be Class or String.");
}
Object value = entry.getValue();
if (!(value instanceof PropertyEditor)) {
throw new IllegalArgumentException("Mapped value [" + value + "] for custom editor key [" + key
+ "] is not of required type [" + PropertyEditor.class.getName() + "]");
}
this.customEditors.put(requiredType, (PropertyEditor) value);
PropertyEditor value = entry.getValue();
this.customEditors.put(requiredType, value);
}
}

2
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/AnnotationMethodResolverTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AnnotationMethodResolverTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.configuration.xml;
package org.springframework.batch.support;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

44
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java
View File

@@ -16,22 +16,25 @@
package org.springframework.batch.support;
import static org.junit.Assert.assertEquals;
import java.util.Collections;
import java.util.Properties;
import junit.framework.TestCase;
import org.junit.Test;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.beans.propertyeditors.PropertiesEditor;
public class DefaultPropertEditorRegistrarTests extends TestCase {
public class DefaultPropertEditorRegistrarTests {
@Test
public void testIntArray() throws Exception {
DefaultPropertyEditorRegistrar mapper = new DefaultPropertyEditorRegistrar();
BeanWithIntArray result = new BeanWithIntArray();
BeanWrapperImpl wrapper = new BeanWrapperImpl(result);
mapper.setCustomEditors(Collections.singletonMap(int[].class, new IntArrayPropertyEditor()));
BeanWrapperImpl wrapper = new BeanWrapperImpl(result);
mapper.registerCustomEditors(wrapper);
PropertiesEditor editor = new PropertiesEditor();
editor.setAsText("numbers=1,2,3, 4");
@@ -40,32 +43,45 @@ public class DefaultPropertEditorRegistrarTests extends TestCase {
assertEquals(4, result.numbers[3]);
}
@Test(expected = IllegalArgumentException.class)
public void testSetCustomEditorsWithInvalidTypeName() throws Exception {
DefaultPropertyEditorRegistrar mapper = new DefaultPropertyEditorRegistrar();
try {
mapper.setCustomEditors(Collections.singletonMap("FOO", new CustomNumberEditor(Long.class, true)));
} catch (IllegalArgumentException e) {
// expected
}
mapper.setCustomEditors(Collections.singletonMap("FOO", new CustomNumberEditor(Long.class, true)));
}
@Test
public void testSetCustomEditorsWithStringTypeName() throws Exception {
DefaultPropertyEditorRegistrar mapper = new DefaultPropertyEditorRegistrar();
mapper.setCustomEditors(Collections.singletonMap("java.lang.Long", new CustomNumberEditor(Long.class, true)));
BeanWithIntArray result = new BeanWithIntArray();
BeanWrapperImpl wrapper = new BeanWrapperImpl(result);
mapper.registerCustomEditors(wrapper);
wrapper.setPropertyValues(new MutablePropertyValues(Collections.singletonMap("number", "123")));
assertEquals(123L, result.number);
}
@Test(expected = IllegalArgumentException.class)
public void testSetCustomEditorsWithInvalidType() throws Exception {
DefaultPropertyEditorRegistrar mapper = new DefaultPropertyEditorRegistrar();
try {
mapper.setCustomEditors(Collections.singletonMap(new Object(), new CustomNumberEditor(Long.class, true)));
} catch (IllegalArgumentException e) {
// expected
}
mapper.setCustomEditors(Collections.singletonMap(new Object(), new CustomNumberEditor(Long.class, true)));
}
private static class BeanWithIntArray {
private int[] numbers;
private long number;
public void setNumbers(int[] numbers) {
this.numbers = numbers;
}
public void setNumber(long number) {
this.number = number;
}
}
}