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

BATCH-1033: Updated to account for the possibility of a null key in the map

Browse Source
This commit is contained in:
dhgarrette
2009-01-28 05:19:31 +00:00
parent 18f7870ba2
commit 505d8532f9
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java
View File

@@ -56,13 +56,14 @@ public class PrefixMatchingCompositeLineTokenizer implements LineTokenizer, Init
if (line != null) {
for (String key : delegates.keySet()) {
if ("".equals(key)) {
defaultDelegate = delegates.get(key);
// don't break here or the delegate may not be found
}
else if (line.startsWith(key)) {
delegate = delegates.get(key);
break;
if (key != null) {
if ("".equals(key)) {
defaultDelegate = delegates.get(key);
}
else if (line.startsWith(key)) {
delegate = delegates.get(key);
break;
}
}
}

31
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java
View File

@@ -49,16 +49,41 @@ public class PrefixMatchingCompositeLineTokenizerTests {
@Test
public void testNullLineWithKey() throws Exception {
Map<String, LineTokenizer> map = new HashMap<String, LineTokenizer>();
map.put(null, new DelimitedLineTokenizer());
map.put(null, new LineTokenizer() {
public FieldSet tokenize(String line) {
return new DefaultFieldSet(new String[] { "a" });
}
});
map.put("foo", new LineTokenizer() {
public FieldSet tokenize(String line) {
return null;
return new DefaultFieldSet(new String[] { "b" });
}
});
tokenizer.setTokenizers(map);
tokenizer.afterPropertiesSet();
FieldSet fields = tokenizer.tokenize(null);
assertEquals(0, fields.getFieldCount());
assertEquals(1, fields.getFieldCount());
assertEquals("a", fields.readString(0));
}
@Test
public void testNullKey() throws Exception {
Map<String, LineTokenizer> map = new HashMap<String, LineTokenizer>();
map.put(null, new LineTokenizer() {
public FieldSet tokenize(String line) {
return new DefaultFieldSet(new String[] { "a" });
}
});
map.put("foo", new LineTokenizer() {
public FieldSet tokenize(String line) {
return new DefaultFieldSet(new String[] { "b" });
}
});
tokenizer.setTokenizers(map);
tokenizer.afterPropertiesSet();
FieldSet fields = tokenizer.tokenize("foo");
assertEquals(1, fields.getFieldCount());
assertEquals("b", fields.readString(0));
}
@Test