From c9d7b45f14b11b2f10e66e66c8b25b2207338cfb Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 30 Dec 2008 07:56:36 +0000
Subject: [PATCH] RESOLVED - issue BATCH-977: DefaultLineMapper should check
 for its required dependencies

---
 .../batch/item/file/mapping/DefaultLineMapper.java |  9 ++++++++-
 .../item/file/mapping/DefaultLineMapperTests.java  | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
index acd1b1237..fa6ce2c1f 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
@@ -2,6 +2,8 @@ package org.springframework.batch.item.file.mapping;
 
 import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
 
 /**
  * Two-phase {@link LineMapper} implementation consisting of tokenization of the
@@ -11,7 +13,7 @@ import org.springframework.batch.item.file.transform.LineTokenizer;
  * 
  * @param <T> type of the item
  */
-public class DefaultLineMapper<T> implements LineMapper<T> {
+public class DefaultLineMapper<T> implements LineMapper<T>, InitializingBean {
 
 	private LineTokenizer tokenizer;
 
@@ -29,4 +31,9 @@ public class DefaultLineMapper<T> implements LineMapper<T> {
 		this.fieldSetMapper = fieldSetMapper;
 	}
 
+	public void afterPropertiesSet() {
+		Assert.notNull(tokenizer, "The LineTokenizer must be set");
+		Assert.notNull(fieldSetMapper, "The FieldSetMapper must be set");
+	}
+
 }
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
index 1bf4a5276..f95905dca 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
@@ -14,6 +15,19 @@ import org.springframework.batch.item.file.transform.LineTokenizer;
 public class DefaultLineMapperTests {
 
 	private DefaultLineMapper<String> tested = new DefaultLineMapper<String>();
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testMandatoryTokenizer() throws Exception {
+		tested.afterPropertiesSet();
+		tested.mapLine("foo", 1);
+	}
+	
+	@Test(expected=IllegalArgumentException.class)
+	public void testMandatoryMapper() throws Exception {
+		tested.setLineTokenizer(new DelimitedLineTokenizer());
+		tested.afterPropertiesSet();
+		tested.mapLine("foo", 1);
+	}
 	
 	@Test
 	public void testMapping() throws Exception {