INT-2433: Get Rid of MessageProcessors wrapping

Previously, provided `MessageProcessor` to create a `MessageHandler` for endpoint was wrapped to `MethodInvokingMessageProcessor`, e.g. `GroovyScriptExecutingMessageProcessor`. Check the type of provided object in the constructor of `MethodInvoking*` strategies and use it directly if it is `MessageProcessor` JIRA: https://jira.springsource.org/browse/INT-2433
daniv · Sep 18, 2013 · 4d3bc36 · 4d3bc36
1 parent 417c848
commit 4d3bc36
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 29 deletions.
diff --git a/publish-maven.gradle b/publish-maven.gradle
@@ -60,7 +60,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = 'markfisher'
 					name = 'Mark Fisher'
-					email = 'markfisher@gopivotal.com'
+					email = 'mfisher@gopivotal.com'
 					roles = ["project founder and lead emeritus"]
 				}
 				developer {

diff --git a/...ava/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java b/...ava/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java
@@ -34,6 +34,7 @@
  * @author Mark Fisher
  * @author Alexander Peters
  * @author Gary Russell
+ * @author Artem Bilan
  */
 abstract class AbstractStandardMessageHandlerFactoryBean extends AbstractSimpleMessageHandlerFactoryBean<MessageHandler> {
 
@@ -135,7 +136,7 @@ MessageHandler createExpressionEvaluatingHandler(Expression expression) {
 	}
 
 	<T> MessageHandler createMessageProcessingHandler(MessageProcessor<T> processor) {
-		return this.createMethodInvokingHandler(processor, "processMessage");
+		return this.createMethodInvokingHandler(processor, null);
 	}
 
 	MessageHandler createDefaultHandler() {

diff --git a/...ion-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/...ion-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,13 +20,15 @@
 
 import org.springframework.integration.annotation.Filter;
 import org.springframework.integration.core.MessageSelector;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.handler.MethodInvokingMessageProcessor;
 import org.springframework.util.Assert;
 
 /**
  * A method-invoking implementation of {@link MessageSelector}.
- * 
+ *
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class MethodInvokingSelector extends AbstractMessageProcessingSelector {
 
@@ -42,8 +44,10 @@ public MethodInvokingSelector(Object object, String methodName) {
 		super(new MethodInvokingMessageProcessor<Boolean>(object, methodName));
 	}
 
+	@SuppressWarnings("unchecked")
 	public MethodInvokingSelector(Object object) {
-		super(new MethodInvokingMessageProcessor<Boolean>(object, Filter.class));
+		super(object instanceof MessageProcessor<?> ? (MessageProcessor<Boolean>) object :
+				new MethodInvokingMessageProcessor<Boolean>(object, Filter.class));
 	}
 
 }
diff --git a/...src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java b/...src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -28,16 +28,16 @@
 /**
  * A base class for Router implementations that delegate to a
  * {@link MessageProcessor} instance.
- * 
+ *
  * @author Mark Fisher
  * @since 2.0
  */
 class AbstractMessageProcessingRouter extends AbstractMappingMessageRouter {
 
-	private final MessageProcessor<Object> messageProcessor;
+	private final MessageProcessor<?> messageProcessor;
 
 
-	AbstractMessageProcessingRouter(MessageProcessor<Object> messageProcessor) {
+	AbstractMessageProcessingRouter(MessageProcessor<?> messageProcessor) {
 		Assert.notNull(messageProcessor, "messageProcessor must not be null");
 		this.messageProcessor = messageProcessor;
 	}
@@ -47,7 +47,7 @@ class AbstractMessageProcessingRouter extends AbstractMappingMessageRouter {
 	public final void onInit() {
 		super.onInit();
 		if (this.messageProcessor instanceof AbstractMessageProcessor) {
-			((AbstractMessageProcessor<Object>) this.messageProcessor).setConversionService(this.getConversionService());
+			((AbstractMessageProcessor<?>) this.messageProcessor).setConversionService(this.getConversionService());
 		}
 		if (this.messageProcessor instanceof BeanFactoryAware) {
 			((BeanFactoryAware) this.messageProcessor).setBeanFactory(this.getBeanFactory());

diff --git a/...ation-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/...ation-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 
 import org.springframework.integration.annotation.Router;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.handler.MethodInvokingMessageProcessor;
 import org.springframework.integration.support.channel.ChannelResolver;
 
@@ -28,8 +29,9 @@
  * String to be interpreted as a channel name, or a Collection (or Array) of
  * either type. If the method returns channel names, then a
  * {@link ChannelResolver} is required.
- * 
+ *
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class MethodInvokingRouter extends AbstractMessageProcessingRouter {
 
@@ -42,7 +44,8 @@ public MethodInvokingRouter(Object object, String methodName) {
 	}
 
 	public MethodInvokingRouter(Object object) {
-		super(new MethodInvokingMessageProcessor<Object>(object, Router.class));
+		super(object instanceof MessageProcessor<?> ? (MessageProcessor<?>) object :
+				new MethodInvokingMessageProcessor<Object>(object, Router.class));
 	}
 
 }
diff --git a/...n-core/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java b/...n-core/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,6 +20,7 @@
 import java.util.Collection;
 
 import org.springframework.integration.annotation.Splitter;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.handler.MethodInvokingMessageProcessor;
 
 /**
@@ -28,8 +29,9 @@
  * is a Collection or Array. If the return value is not a Collection or
  * Array, then the single Object will be returned as the payload of a
  * single reply Message.
- * 
+ *
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class MethodInvokingSplitter extends AbstractMessageProcessingSplitter {
 
@@ -41,8 +43,10 @@ public MethodInvokingSplitter(Object object, String methodName) {
 		super(new MethodInvokingMessageProcessor<Collection<?>>(object, methodName));
 	}
 
+	@SuppressWarnings("unchecked")
 	public MethodInvokingSplitter(Object object) {
-		super(new MethodInvokingMessageProcessor<Collection<?>>(object, Splitter.class));
+		super(object instanceof MessageProcessor<?> ? (MessageProcessor<Collection<?>>) object :
+				new MethodInvokingMessageProcessor<Collection<?>>(object, Splitter.class));
 	}
 
 }
diff --git a/.../src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java b/.../src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,15 +19,17 @@
 import java.lang.reflect.Method;
 
 import org.springframework.integration.annotation.Transformer;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.handler.MethodInvokingMessageProcessor;
 
 /**
  * A Message Transformer implementation that invokes the specified method
  * on the given object. The method's return value will be considered as
  * the payload of a new Message unless the return value is itself already
  * a Message.
- * 
+ *
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class MethodInvokingTransformer extends AbstractMessageProcessingTransformer {
 
@@ -40,7 +42,8 @@ public MethodInvokingTransformer(Object object, String methodName) {
 	}
 
 	public MethodInvokingTransformer(Object object) {
-		super(new MethodInvokingMessageProcessor<Object>(object, Transformer.class));
+		super(object instanceof MessageProcessor<?> ? (MessageProcessor<?>) object :
+				new MethodInvokingMessageProcessor<Object>(object, Transformer.class));
 	}
 
 }
diff --git a/...src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests-context.xml b/...src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<filter input-channel="referencedScriptInput">
+	<filter id="groovyFilter" input-channel="referencedScriptInput">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovyFilterTests.groovy"/>
 	</filter>
 

diff --git a/...groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java b/...groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,20 +19,30 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.core.MessageHandler;
+import org.springframework.integration.core.MessageSelector;
+import org.springframework.integration.filter.MessageFilter;
+import org.springframework.integration.filter.MethodInvokingSelector;
+import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  * @since 2.0
  */
 @ContextConfiguration
@@ -45,6 +55,9 @@ public class GroovyFilterTests {
 	@Autowired
 	private MessageChannel inlineScriptInput;
 
+	@Autowired
+	@Qualifier("groovyFilter.handler")
+	private MessageHandler groovyFilterMessageHandler;
 
 	@Test
 	public void referencedScript() {
@@ -57,7 +70,7 @@ public void referencedScript() {
 		Message<?> message2 = MessageBuilder.withPayload("test-2")
 				.setReplyChannel(replyChannel)
 				.setHeader("type", "good")
-				.build();		
+				.build();
 		this.referencedScriptInput.send(message1);
 		this.referencedScriptInput.send(message2);
 		assertEquals("test-2", replyChannel.receive(0).getPayload());
@@ -69,7 +82,7 @@ public void inlineScript() {
 		QueueChannel replyChannel = new QueueChannel();
 		replyChannel.setBeanName("returnAddress");
 		Message<?> message1 = MessageBuilder.withPayload("bad").setReplyChannel(replyChannel).build();
-		Message<?> message2 = MessageBuilder.withPayload("good").setReplyChannel(replyChannel).build();		
+		Message<?> message2 = MessageBuilder.withPayload("good").setReplyChannel(replyChannel).build();
 		this.inlineScriptInput.send(message1);
 		this.inlineScriptInput.send(message2);
 		Message<?> received = replyChannel.receive(0);
@@ -79,4 +92,14 @@ public void inlineScript() {
 		assertNull(replyChannel.receive(0));
 	}
 
+	@Test
+	public void testInt2433VerifyRiddingOfMessageProcessorsWrapping() {
+		assertTrue(this.groovyFilterMessageHandler instanceof MessageFilter);
+		MessageSelector selector = TestUtils.getPropertyValue(this.groovyFilterMessageHandler, "selector",
+				MethodInvokingSelector.class);
+		MessageProcessor messageProcessor = TestUtils.getPropertyValue(selector, "messageProcessor", MessageProcessor.class);
+		//before it was MethodInvokingMessageProcessor
+		assertTrue(messageProcessor instanceof GroovyScriptExecutingMessageProcessor);
+	}
+
 }
diff --git a/...src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests-context.xml b/...src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests-context.xml
@@ -15,7 +15,7 @@
 		<queue/>
 	</channel>
 
-	<router input-channel="referencedScriptInput">
+	<router id="groovyRouter" input-channel="referencedScriptInput">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovyRouterTests.groovy"/>
 	</router>
 

diff --git a/...groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java b/...groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -18,20 +18,28 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
+import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor;
+import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.integration.message.GenericMessage;
+import org.springframework.integration.router.MethodInvokingRouter;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  * @since 2.0
  */
 @ContextConfiguration
@@ -50,6 +58,9 @@ public class GroovyRouterTests {
 	@Autowired
 	private PollableChannel shortStrings;
 
+	@Autowired
+	@Qualifier("groovyRouter.handler")
+	private MessageHandler groovyRouterMessageHandler;
 
 	@Test
 	public void referencedScript() { // long is > 3
@@ -93,4 +104,13 @@ public void inlineScript() { // long is > 5
 		assertNull(longStrings.receive(0));
 	}
 
+	@Test
+	public void testInt2433VerifyRiddingOfMessageProcessorsWrapping() {
+		assertTrue(this.groovyRouterMessageHandler instanceof MethodInvokingRouter);
+		MessageProcessor messageProcessor = TestUtils.getPropertyValue(this.groovyRouterMessageHandler,
+				"messageProcessor", MessageProcessor.class);
+		//before it was MethodInvokingMessageProcessor
+		assertTrue(messageProcessor instanceof GroovyScriptExecutingMessageProcessor);
+	}
+
 }
diff --git a/...c/test/java/org/springframework/integration/groovy/config/GroovySplitterTests-context.xml b/...c/test/java/org/springframework/integration/groovy/config/GroovySplitterTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<splitter input-channel="referencedScriptInput">
+	<splitter id="groovySplitter" input-channel="referencedScriptInput">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovySplitterTests.groovy"/>
 	</splitter>