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

Patch for groovy support from Oleg

Browse Source
This commit is contained in:
David Syer
2010-09-02 06:46:00 +00:00
parent a1a4a31a71
commit 552432c7d5
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,7 @@ public class RefreshableResourceScriptSource implements ScriptSource {
}
public String getScriptAsString() throws IOException {
if (isModified()) {
this.script = source.getScriptAsString();
}
this.script = source.getScriptAsString();
return script;
}

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

@@ -79,10 +79,21 @@ public class GroovyScriptExecutingMessageProcessorTests {
TestResource resource = new TestResource(script, "simpleTest");
ScriptSource scriptSource = new RefreshableResourceScriptSource(resource, 1000L);
MessageProcessor<Object> processor = new GroovyScriptExecutingMessageProcessor(scriptSource);
Thread.sleep(20L);
resource.setScript("return \"payload is $payload\"");
// should be the original script
Object result = processor.processMessage(message);
assertEquals("payload is foo, header is bar", result.toString());
//reset the script with the new strimg
resource.setScript("return \"payload is $payload\"");
Thread.sleep(20L);
// should still assert to the old script because not enough time elapsed for refresh to kick in
result = processor.processMessage(message);
assertEquals("payload is foo, header is bar", result.toString());
// sleep some more, past refresh time
Thread.sleep(1000L);
// now you go the new script
resource.setScript("return \"payload is $payload\"");
result = processor.processMessage(message);
assertEquals("payload is foo", result.toString());
}
@Test
@@ -92,9 +103,14 @@ public class GroovyScriptExecutingMessageProcessorTests {
TestResource resource = new TestResource(script, "simpleTest");
ScriptSource scriptSource = new RefreshableResourceScriptSource(resource, -1L);
MessageProcessor<Object> processor = new GroovyScriptExecutingMessageProcessor(scriptSource);
resource.setScript("return \"payload is $payload\"");
// process with the first script
Object result = processor.processMessage(message);
assertEquals("payload is foo, header is bar", result.toString());
// change script, but since refresh-delay is less then 0 we should still se old script executing
resource.setScript("return \"payload is $payload\"");
// process and see assert that the old script is used
result = processor.processMessage(message);
assertEquals("payload is foo, header is bar", result.toString());
}