From 013e09c888f956af4bf6cbf21cf029f5632aae4c Mon Sep 17 00:00:00 2001
From: Artem Bilan <clericsmail@gmail.com>
Date: Tue, 7 Feb 2012 17:26:21 +0200
Subject: [PATCH] INT-2399-maint:

Refactor ReplyRequiredException to MessageHandlingException
---
 .../groovy/config/GroovyServiceActivatorTests-context.xml    | 4 ++--
 .../groovy/config/GroovyServiceActivatorTests.java           | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
index 544173bffa..bc81dab8e5 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
@@ -45,9 +45,9 @@
 	<service-activator input-channel="invalidInlineScript">
         <groovy:script>
             <![CDATA[
-                  //import org.springframework.integration.handler.ReplyRequiredException
+                  //import org.springframework.integration.MessageHandlingException
 
-                  if (payload in ReplyRequiredException) return 'OK'
+                  if (payload in MessageHandlingException) return 'OK'
                   throw payload
                 ]]>
         </groovy:script>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
index 20dbe94cc0..88b0408b4a 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
@@ -38,7 +38,6 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.handler.ReplyRequiredException;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.scripting.ScriptVariableGenerator;
@@ -141,7 +140,7 @@ public class GroovyServiceActivatorTests {
 	//INT-2399
 	@Test(expected = MessageHandlingException.class)
 	public void invalidInlineScript() throws Exception {
-		Message message = new ErrorMessage(new ReplyRequiredException(new GenericMessage<String>("test"), "reply required!"));
+		Message message = new ErrorMessage(new MessageHandlingException(new GenericMessage<String>("test"), "reply required!"));
 		try {
 			this.invalidInlineScript.send(message);
 			fail("MessageHandlingException expected!");
@@ -149,7 +148,7 @@ public class GroovyServiceActivatorTests {
 		catch (Exception e) {
 			Throwable cause = e.getCause();
 			assertEquals(MissingPropertyException.class, cause.getClass());
-			assertThat(cause.getMessage(), Matchers.containsString("No such property: ReplyRequiredException for class: groovy.lang"));
+			assertThat(cause.getMessage(), Matchers.containsString("No such property: MessageHandlingException for class: groovy.lang"));
 		    throw e;
 		}