From 117f31a15673d1518d946a9b8a06028a39f6221a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 1 Nov 2013 17:04:35 -0400 Subject: [PATCH] Remove Remaining SI GenericMessage References --- .../ftp/outbound/FtpServerOutboundTests.java | 2 +- .../GroovyScriptExecutingMessageProcessorTests.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java index d2d96079d2..36b5cb76b1 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java @@ -32,9 +32,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.ftp.TesFtpServer; -import org.springframework.integration.message.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java index 888a70b7cb..e54c2f52d2 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java @@ -19,6 +19,7 @@ package org.springframework.integration.groovy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import groovy.lang.Script; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -34,19 +35,17 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.core.io.AbstractResource; -import org.springframework.messaging.Message; import org.springframework.integration.handler.MessageProcessor; -import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scripting.RefreshableResourceScriptSource; import org.springframework.integration.scripting.ScriptVariableGenerator; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.GenericMessage; import org.springframework.scripting.ScriptSource; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.scripting.support.StaticScriptSource; import org.springframework.test.annotation.Repeat; -import groovy.lang.Script; - /** * @author Mark Fisher * @author Dave Syer @@ -59,7 +58,7 @@ public class GroovyScriptExecutingMessageProcessorTests { @Rule public RepeatProcessor repeater = new RepeatProcessor(4); - private AtomicInteger countHolder = new AtomicInteger(); + private final AtomicInteger countHolder = new AtomicInteger(); @Test @Repeat(20) @@ -236,6 +235,7 @@ public class GroovyScriptExecutingMessageProcessorTests { this.filename = filename; } + @Override public long lastModified() throws IOException { return lastModified; }