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

INT-1727 added Message as input parameter to ScriptVariableSource.resolveScriptVariables(Message) method

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-01-26 10:20:02 -05:00
parent e6d58735dd
commit 403855fea6
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
View File

@@ -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;

4
spring-integration-groovy/src/main/java/org/springframework/integration/groovy/ScriptVariableSource.java
View File

@@ -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);
}

2
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
View File

@@ -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;