diff --git a/build.properties b/build.properties
index 120043585a..6533b3840a 100644
--- a/build.properties
+++ b/build.properties
@@ -7,6 +7,6 @@ ivy.cache.dir=${basedir}/../ivy-cache
integration.repo.dir=${basedir}/../integration-repo
javadoc.exclude.package.names=org/springframework/integration/samples/**
# dependency versions
-spring.version=3.0.1.RELEASE-A
+spring.version=3.0.2.RELEASE
junit.version=4.7.0
mockito.version=1.8.0
diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index 4113ace752..3e252778a5 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -7,11 +7,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath
index 4113ace752..3e252778a5 100644
--- a/org.springframework.integration.event/.classpath
+++ b/org.springframework.integration.event/.classpath
@@ -7,11 +7,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath
index d9ddc8d757..f07183bd80 100644
--- a/org.springframework.integration.file/.classpath
+++ b/org.springframework.integration.file/.classpath
@@ -7,12 +7,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath
index 24e4d68e93..d55116d3bf 100644
--- a/org.springframework.integration.http/.classpath
+++ b/org.springframework.integration.http/.classpath
@@ -11,14 +11,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath
index 126aa21e56..366a769c94 100644
--- a/org.springframework.integration.httpinvoker/.classpath
+++ b/org.springframework.integration.httpinvoker/.classpath
@@ -9,14 +9,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.ip/.classpath b/org.springframework.integration.ip/.classpath
index eb80a01c94..6629c34424 100644
--- a/org.springframework.integration.ip/.classpath
+++ b/org.springframework.integration.ip/.classpath
@@ -7,12 +7,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/org.springframework.integration.jdbc/.classpath b/org.springframework.integration.jdbc/.classpath
index 513055b68b..f0e152f720 100644
--- a/org.springframework.integration.jdbc/.classpath
+++ b/org.springframework.integration.jdbc/.classpath
@@ -12,15 +12,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath
index 9cb50820c8..588d219aba 100644
--- a/org.springframework.integration.jms/.classpath
+++ b/org.springframework.integration.jms/.classpath
@@ -10,14 +10,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.jmx/.classpath b/org.springframework.integration.jmx/.classpath
index b2ed6c1329..66051121b8 100644
--- a/org.springframework.integration.jmx/.classpath
+++ b/org.springframework.integration.jmx/.classpath
@@ -7,11 +7,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath
index 2bd326666c..c134f4da3d 100644
--- a/org.springframework.integration.mail/.classpath
+++ b/org.springframework.integration.mail/.classpath
@@ -9,13 +9,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.rmi/.classpath b/org.springframework.integration.rmi/.classpath
index 369a7c9551..bfd31c825d 100644
--- a/org.springframework.integration.rmi/.classpath
+++ b/org.springframework.integration.rmi/.classpath
@@ -8,13 +8,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath
index c1768817c4..f0c3cd62a8 100644
--- a/org.springframework.integration.security/.classpath
+++ b/org.springframework.integration.security/.classpath
@@ -9,14 +9,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath
index a6bd0e1ff4..6962dba885 100644
--- a/org.springframework.integration.stream/.classpath
+++ b/org.springframework.integration.stream/.classpath
@@ -7,12 +7,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath
index f40e92ace8..a276ed784b 100644
--- a/org.springframework.integration.test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -9,15 +9,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 159fdebb1f..b07c6673e7 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -9,15 +9,15 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath
index 3ecd207f82..e82bfce514 100644
--- a/org.springframework.integration.xml/.classpath
+++ b/org.springframework.integration.xml/.classpath
@@ -11,14 +11,14 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 5f1bbf241c..a70f1fe9f3 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -11,14 +11,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
index 39b79cbfc2..4c3a847730 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
@@ -47,7 +47,7 @@ public abstract class AbstractMessageProcessor implements MessageProcessor {
try {
return expression.getValue(this.evaluationContext, message);
}
- catch (EvaluationException e) {
+ catch (Exception e) {
throw new MessageHandlingException(message, "Expression evaluation failed.", e);
}
}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java
index ccb5a1070b..7f3513bef0 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,76 +44,92 @@ public class MethodInvokingMessageProcessorTests {
@Test
public void testHandlerInheritanceMethodImplInSuper() {
- class A{
- public Message myMethod(final Message msg){
+ class A {
+ @SuppressWarnings("unused")
+ public Message myMethod(final Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("A", "A").build();
}
}
- class B extends A{}
- class C extends B{}
- MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(
- new B(), "myMethod");
- Message message = (Message) processor.processMessage(new StringMessage(""));
+
+ class B extends A {}
+
+ @SuppressWarnings("unused")
+ class C extends B {}
+
+ MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new B(), "myMethod");
+ Message message = (Message) processor.processMessage(new StringMessage(""));
assertEquals("A", message.getHeaders().get("A"));
}
+
@Test
public void testHandlerInheritanceMethodImplInLatestSuper() {
- class A{
- public Message myMethod(Message msg){
+ class A {
+ @SuppressWarnings("unused")
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("A", "A").build();
}
}
- class B extends A{
- public Message myMethod(Message msg){
+
+ class B extends A {
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("B", "B").build();
}
}
- class C extends B{}
- MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(
- new B(), "myMethod");
- Message message = (Message) processor.processMessage(new StringMessage(""));
+
+ @SuppressWarnings("unused")
+ class C extends B {}
+
+ MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new B(), "myMethod");
+ Message message = (Message) processor.processMessage(new StringMessage(""));
assertEquals("B", message.getHeaders().get("B"));
}
-
+
public void testHandlerInheritanceMethodImplInSubClass() {
- class A{
- public Message myMethod(Message msg){
+ class A {
+ @SuppressWarnings("unused")
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("A", "A").build();
}
}
- class B extends A{
- public Message myMethod(Message msg){
+
+ class B extends A {
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("B", "B").build();
}
}
- class C extends B{
- public Message myMethod(Message msg){
+
+ class C extends B {
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("C", "C").build();
}
}
- MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(
- new C(), "myMethod");
- Message message = (Message) processor.processMessage(new StringMessage(""));
+
+ MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new C(), "myMethod");
+ Message message = (Message) processor.processMessage(new StringMessage(""));
assertEquals("C", message.getHeaders().get("C"));
}
+
public void testHandlerInheritanceMethodImplInSubClassAndSuper() {
- class A{
+ class A {
+ @SuppressWarnings("unused")
public Message myMethod(Message msg){
return MessageBuilder.fromMessage(msg).setHeader("A", "A").build();
}
}
- class B extends A{}
- class C extends B{
- public Message myMethod(Message msg){
+
+ class B extends A {}
+
+ class C extends B {
+ public Message myMethod(Message msg) {
return MessageBuilder.fromMessage(msg).setHeader("C", "C").build();
}
}
- MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(
- new C(), "myMethod");
- Message message = (Message) processor.processMessage(new StringMessage(""));
+
+ MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new C(), "myMethod");
+ Message message = (Message) processor.processMessage(new StringMessage(""));
assertEquals("C", message.getHeaders().get("C"));
}
-
+
@Test
public void payloadAsMethodParameterAndObjectAsReturnValue() {
MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(
@@ -185,10 +201,11 @@ public class MethodInvokingMessageProcessorTests {
MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new TestBean(), "testVoidReturningMethods", true);
assertEquals(12, processor.processMessage(MessageBuilder.withPayload(12).build()));
try {
- processor.processMessage(MessageBuilder.withPayload("Something").build());
+ processor.processMessage(MessageBuilder.withPayload("not_a_number").build());
fail();
}
catch(MessageHandlingException ex) {
+ // the only void method expects a number
exception = ex;
}
assertNotNull(exception);
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index 15a8dd0b54..2644eca0bd 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -13,7 +13,7 @@
3.4.2.v_883_R34x
4.7
- 3.0.1.RELEASE
+ 3.0.2.RELEASE
true
diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml
index cfc449b703..e1e051c65e 100644
--- a/spring-integration-samples/loan-broker/pom.xml
+++ b/spring-integration-samples/loan-broker/pom.xml
@@ -19,7 +19,7 @@
org.springframework
org.springframework.spring-library
libd
- 3.0.1.RELEASE
+ 3.0.2.RELEASE
org.junit
diff --git a/spring-integration-samples/loanshark/.classpath b/spring-integration-samples/loanshark/.classpath
index 4241ac4294..6fa4142331 100644
--- a/spring-integration-samples/loanshark/.classpath
+++ b/spring-integration-samples/loanshark/.classpath
@@ -49,28 +49,28 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index ab3611320d..229dcd7c08 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -404,7 +404,7 @@
- 3.0.1.RELEASE-A
+ 3.0.2.RELEASE
1.6.6.RELEASE