From 403855fea6281104c3870434160b7c90550e7874 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 26 Jan 2011 10:20:02 -0500
Subject: [PATCH] INT-1727 added Message as input parameter to
 ScriptVariableSource.resolveScriptVariables(Message) method

---
 .../groovy/GroovyScriptExecutingMessageProcessor.java         | 2 +-
 .../integration/groovy/ScriptVariableSource.java              | 4 +++-
 .../groovy/GroovyScriptExecutingMessageProcessorTests.java    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
index b9b71f311b..bd0c29cf3d 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
@@ -64,7 +64,7 @@ public class GroovyScriptExecutingMessageProcessor extends AbstractScriptExecuti
 		synchronized (this) {
 			this.customizer.setMessage(message);
 			if (this.scriptVariableSource != null){
-				this.customizer.setResolvedScriptVariables(this.scriptVariableSource.resolveScriptVariables());
+				this.customizer.setResolvedScriptVariables(this.scriptVariableSource.resolveScriptVariables(message));
 			}		
 			Object result = this.scriptFactory.getScriptedObject(scriptSource, null);
 			return (result instanceof GString) ? result.toString() : result;
diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/ScriptVariableSource.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/ScriptVariableSource.java
index cbc327d393..3864c68bce 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/ScriptVariableSource.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/ScriptVariableSource.java
@@ -17,6 +17,8 @@ package org.springframework.integration.groovy;
 
 import java.util.Map;
 
+import org.springframework.integration.Message;
+
 
 /**
  * @author Oleg Zhurakousky
@@ -24,5 +26,5 @@ import java.util.Map;
  */
 public interface ScriptVariableSource {
 	
-	Map<String, Object> resolveScriptVariables();
+	Map<String, Object> resolveScriptVariables(Message<?> message);
 }
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
index 8641d2e2f9..3d1cd34457 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
@@ -74,7 +74,7 @@ public class GroovyScriptExecutingMessageProcessorTests {
 		Object result = null;
 		for (int i = 0; i < 5; i++) {
 			ScriptVariableSource scriptVariableSource = new ScriptVariableSource() {	
-				public Map<String, Object> resolveScriptVariables() {
+				public Map<String, Object> resolveScriptVariables(Message<?> message) {
 					Map<String, Object> map = new HashMap<String, Object>();
 					map.put("date", System.nanoTime());
 					return map;