Refactored MessageProcessingTransformer to an abstract base class with separate MethodInvokingTransformer and ExpressionEvaluatingTransformer sub-classes (now consistent with splitter, router, etc).
This commit is contained in:
@@ -28,8 +28,6 @@ import org.junit.Test;
|
||||
import org.springframework.integration.annotation.Header;
|
||||
import org.springframework.integration.annotation.Transformer;
|
||||
import org.springframework.integration.core.Message;
|
||||
import org.springframework.integration.handler.MethodInvokingMessageProcessor;
|
||||
import org.springframework.integration.handler.MessageProcessor;
|
||||
import org.springframework.integration.message.GenericMessage;
|
||||
import org.springframework.integration.message.MessageBuilder;
|
||||
import org.springframework.integration.message.MessageHandlingException;
|
||||
@@ -44,8 +42,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void simplePayloadConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("exclaim", String.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<?> message = new StringMessage("foo");
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("FOO!", result.getPayload());
|
||||
@@ -54,8 +51,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void simplePayloadConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "exclaim");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "exclaim");
|
||||
Message<?> message = new StringMessage("foo");
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("FOO!", result.getPayload());
|
||||
@@ -65,8 +61,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void typeConversionConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("exclaim", String.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<?> message = new GenericMessage<Integer>(123);
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("123!", result.getPayload());
|
||||
@@ -75,8 +70,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void typeConversionConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "exclaim");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "exclaim");
|
||||
Message<?> message = new GenericMessage<Integer>(123);
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("123!", result.getPayload());
|
||||
@@ -86,8 +80,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void typeConversionFailureConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("exclaim", String.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<?> message = new GenericMessage<Date>(new Date());
|
||||
transformer.transform(message);
|
||||
}
|
||||
@@ -95,8 +88,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void typeConversionFailureConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "exclaim");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "exclaim");
|
||||
Message<?> message = new GenericMessage<Date>(new Date());
|
||||
transformer.transform(message);
|
||||
}
|
||||
@@ -105,8 +97,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void headerAnnotationConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("headerTest", String.class, Integer.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("foo")
|
||||
.setHeader("number", 123).build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
@@ -116,8 +107,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void headerAnnotationConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "headerTest");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "headerTest");
|
||||
Message<String> message = MessageBuilder.withPayload("foo")
|
||||
.setHeader("number", 123).build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
@@ -128,8 +118,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void headerValueNotProvided() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("headerTest", String.class, Integer.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("foo")
|
||||
.setHeader("wrong", 123).build();
|
||||
transformer.transform(message);
|
||||
@@ -139,8 +128,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void optionalHeaderAnnotation() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("optionalHeaderTest", String.class, Integer.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("foo").setHeader("number", 99).build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("foo99", result.getPayload());
|
||||
@@ -150,8 +138,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void optionalHeaderValueNotProvided() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("optionalHeaderTest", String.class, Integer.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("foo").build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("foonull", result.getPayload());
|
||||
@@ -161,8 +148,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void headerEnricherConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("propertyEnricherTest", String.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("test")
|
||||
.setHeader("prop1", "bad")
|
||||
.setHeader("prop3", "baz").build();
|
||||
@@ -176,8 +162,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void headerEnricherConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "propertyEnricherTest");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "propertyEnricherTest");
|
||||
Message<String> message = MessageBuilder.withPayload("test")
|
||||
.setHeader("prop1", "bad")
|
||||
.setHeader("prop3", "baz").build();
|
||||
@@ -192,8 +177,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void messageReturnValueConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("messageReturnValueTest", Message.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Message<String> message = MessageBuilder.withPayload("test").build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("test", result.getPayload());
|
||||
@@ -202,8 +186,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void messageReturnValueConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "messageReturnValueTest");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "messageReturnValueTest");
|
||||
Message<String> message = MessageBuilder.withPayload("test").build();
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertEquals("test", result.getPayload());
|
||||
@@ -214,8 +197,7 @@ public class MethodInvokingTransformerTests {
|
||||
public void propertiesPayloadConfiguredWithMethodReference() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
Method testMethod = testBean.getClass().getMethod("propertyPayloadTest", Properties.class);
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, testMethod);
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
|
||||
Properties props = new Properties();
|
||||
props.setProperty("prop1", "bad");
|
||||
props.setProperty("prop3", "baz");
|
||||
@@ -235,8 +217,7 @@ public class MethodInvokingTransformerTests {
|
||||
@SuppressWarnings("unchecked")
|
||||
public void propertiesPayloadConfiguredWithMethodName() throws Exception {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "propertyPayloadTest");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "propertyPayloadTest");
|
||||
Properties props = new Properties();
|
||||
props.setProperty("prop1", "bad");
|
||||
props.setProperty("prop3", "baz");
|
||||
@@ -255,8 +236,7 @@ public class MethodInvokingTransformerTests {
|
||||
@Test
|
||||
public void nullReturningMethod() {
|
||||
TestBean testBean = new TestBean();
|
||||
MessageProcessor messageProcessor = new MethodInvokingMessageProcessor(testBean, "nullReturnValueTest");
|
||||
MessageProcessingTransformer transformer = new MessageProcessingTransformer(messageProcessor);
|
||||
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "nullReturnValueTest");
|
||||
StringMessage message = new StringMessage("test");
|
||||
Message<?> result = transformer.transform(message);
|
||||
assertNull(result);
|
||||
|
||||
Reference in New Issue
Block a user