From 765503daa4e4c68085fc3a6fbbb4fb2a2242cb16 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 3 May 2011 19:20:57 -0400 Subject: [PATCH] polishing, fixed warning messages --- .../src/test/resources/.svnignore | 0 ...annelAdapterWithRecursiveDirectoryTests.java | 2 +- .../http/support/DefaultHttpHeaderMapper.java | 1 - .../TcpNetClientConnectionFactory.java | 2 -- .../tcp/connection/TcpNioConnectionTests.java | 1 + .../LenghtHeaderSerializationTests.java | 1 - .../test/matcher/PayloadMatcher.java | 1 + .../test/matcher/PayloadMatcherTests.java | 1 + .../src/test/resources/.svnignore | 0 .../xml/transformer/XsltPayloadTransformer.java | 2 -- .../xml/transformer/XsltTransformerTests.java | 17 ++++++----------- 11 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 spring-integration-event/src/test/resources/.svnignore delete mode 100644 spring-integration-test/src/test/resources/.svnignore diff --git a/spring-integration-event/src/test/resources/.svnignore b/spring-integration-event/src/test/resources/.svnignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java index 2673fbaf8b..ee5aa5d3b9 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java @@ -60,7 +60,7 @@ public class FileInboundChannelAdapterWithRecursiveDirectoryTests { assertThat(files.receive(), hasPayload(file)); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test(timeout = 3000) public void shouldReturnFilesMultipleLevels() throws IOException { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index 021033b7aa..fe0fd2ed23 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -37,7 +37,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.http.HttpHeaders; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java index 9ce5f63b7f..5374492332 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java @@ -20,8 +20,6 @@ import java.net.Socket; import javax.net.SocketFactory; -import org.springframework.integration.MessagingException; - /** * A client connection factory that creates {@link TcpNetConnection}s. * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java index 2c6ee11fdf..0431d6b494 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java @@ -50,6 +50,7 @@ public class TcpNioConnectionTests { factory.start(); final CountDownLatch latch = new CountDownLatch(1); Executors.newSingleThreadExecutor().execute(new Runnable() { + @SuppressWarnings("unused") public void run() { try { ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LenghtHeaderSerializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LenghtHeaderSerializationTests.java index bae0989f6b..86598eafd1 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LenghtHeaderSerializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LenghtHeaderSerializationTests.java @@ -16,7 +16,6 @@ package org.springframework.integration.ip.tcp.serializer; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java index d385a4da00..6da5a96db4 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java @@ -53,6 +53,7 @@ import org.springframework.integration.Message; * @author Iwein Fuld * */ +@SuppressWarnings("rawtypes") public class PayloadMatcher extends TypeSafeMatcher { private final Matcher matcher; diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java index 05c2e5503c..29bcbb6c42 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java @@ -70,6 +70,7 @@ public class PayloadMatcherTests { } } + @SuppressWarnings("rawtypes") @Test public void shouldMatchNonParametrizedMessage() throws Exception { Message message = this.message; diff --git a/spring-integration-test/src/test/resources/.svnignore b/spring-integration-test/src/test/resources/.svnignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java index 36879324b2..205c8f3013 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java @@ -136,8 +136,6 @@ public class XsltPayloadTransformer extends AbstractTransformer { /** * User source factory even for directly supported payloads - * - * @return */ public void setAlwaysUseSourceFactory(boolean alwaysUseSourceFactory) { this.alwaysUseSourceFactory = alwaysUseSourceFactory; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java index 36319f3fe1..0ddcf1ba40 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java @@ -15,10 +15,16 @@ */ package org.springframework.integration.xml.transformer; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + import java.util.Properties; 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.context.ApplicationContext; @@ -28,19 +34,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; -import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.xml.transform.StringResult; -import org.w3c.dom.Document; - -import javax.xml.transform.dom.DOMResult; - -import static org.junit.Assert.assertFalse; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; /** * @author Oleg Zhurakousky