From 834d8ee6277736bffa20166c5ce1ff0e82cc9ccb Mon Sep 17 00:00:00 2001
From: Seo Kyung-Seok <ksseo0701@lgcns.com>
Date: Thu, 28 Aug 2014 09:12:35 +0900
Subject: [PATCH] BATCH-2205: MethodInvokingTaskletAdaper does not support
 primitive arguments.  - Improvement of
 AbstractMethodInvokingDelegator.targetClassDeclaresTargetMethod()

---
 .../item/adapter/AbstractMethodInvokingDelegator.java      | 3 ++-
 .../src/main/resources/jobs/taskletJob.xml                 | 7 +++++++
 .../batch/sample/TaskletJobFunctionalTests.java            | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
index 70f01cdb0..dc01d86a5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.MethodInvoker;
 
 /**
@@ -167,7 +168,7 @@ public abstract class AbstractMethodInvokingDelegator<T> implements Initializing
 						if (arguments[j] == null) {
 							continue;
 						}
-						if (!(params[j].isAssignableFrom(arguments[j].getClass()))) {
+						if (!(ClassUtils.isAssignableValue(params[j], arguments[j]))) {
 							argumentsMatchParameters = false;
 						}
 					}
diff --git a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
index 9cb21f6be..3041c9303 100644
--- a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
@@ -27,6 +27,13 @@
 		class="org.springframework.batch.core.step.tasklet.MethodInvokingTaskletAdapter">
 		<property name="targetObject" ref="value" />
 		<property name="targetMethod" value="execute" />
+		<property name="arguments">
+			<list>
+      			<value>foo2</value>
+      			<value type="int">3</value>
+      			<value type="double">3.14</value>
+   			</list>
+		</property>
 	</bean>
 
 	<bean id="value"
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java
index 28b236a38..c6eebb7f4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java
@@ -50,8 +50,11 @@ public class TaskletJobFunctionalTests {
 			this.value = value;
 		}
 
-		public void execute() {
+		public void execute(String strValue, Integer integerValue, double doubleValue) {
 			assertEquals("foo", value);
+			assertEquals("foo2", strValue);
+			assertEquals(3, integerValue.intValue());
+			assertEquals(3.14, doubleValue, 0.01);
 		}
 	}