diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java index 5a3ca11362..fcb9c1f736 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java @@ -49,7 +49,7 @@ public class MethodInvokingAdapterParser extends AbstractSingleBeanDefinitionPar throw new ConfigurationException("The 'method' attribute is required."); } builder.addPropertyReference("object", ref); - builder.addPropertyValue("method", method); + builder.addPropertyValue("methodName", method); } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java index d3a8c8f985..a5349acd12 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java @@ -48,7 +48,7 @@ public class SourceAnnotationPostProcessor extends AbstractAnnotationMethodPostP protected MessageSource processMethod(Object bean, Method method, Annotation annotation) { MethodInvokingSource source = new MethodInvokingSource(); source.setObject(bean); - source.setMethod(method.getName()); + source.setMethodName(method.getName()); return source; } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java index aeea309117..b056c6f7bb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java @@ -45,7 +45,7 @@ public class MethodInvokingSource implements MessageSource, Initializing this.object = object; } - public void setMethod(String method) { + public void setMethodName(String method) { Assert.notNull(method, "'method' must not be null"); this.method = method; } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/util/AbstractMethodInvokingAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/AbstractMethodInvokingAdapter.java index 85fd4ad48d..84d358d9fd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/util/AbstractMethodInvokingAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/util/AbstractMethodInvokingAdapter.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Ordered; import org.springframework.integration.ConfigurationException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml index 21b62427fd..d6c155a086 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml @@ -16,7 +16,7 @@ - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java index ae52d38dc1..7fea6555a3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java @@ -34,7 +34,7 @@ public class MethodInvokingSourceTests { public void testValidMethod() { MethodInvokingSource source = new MethodInvokingSource(); source.setObject(new TestBean()); - source.setMethod("validMethod"); + source.setMethodName("validMethod"); Message result = source.receive(); assertNotNull(result); assertNotNull(result.getPayload()); @@ -45,7 +45,7 @@ public class MethodInvokingSourceTests { public void testNoMatchingMethodName() { MethodInvokingSource source = new MethodInvokingSource(); source.setObject(new TestBean()); - source.setMethod("noMatchingMethod"); + source.setMethodName("noMatchingMethod"); source.receive(); } @@ -53,7 +53,7 @@ public class MethodInvokingSourceTests { public void testInvalidMethodWithArg() { MethodInvokingSource source = new MethodInvokingSource(); source.setObject(new TestBean()); - source.setMethod("invalidMethodWithArg"); + source.setMethodName("invalidMethodWithArg"); source.receive(); } @@ -61,7 +61,7 @@ public class MethodInvokingSourceTests { public void testInvalidMethodWithNoReturnValue() { MethodInvokingSource source = new MethodInvokingSource(); source.setObject(new TestBean()); - source.setMethod("invalidMethodWithNoReturnValue"); + source.setMethodName("invalidMethodWithNoReturnValue"); source.receive(); }