Repository: camel Updated Branches: refs/heads/master f0fcbc8a3 -> 71406bf9f
Some minor cleanup work Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/71406bf9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/71406bf9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/71406bf9 Branch: refs/heads/master Commit: 71406bf9fb063d19f3777422e1431e0aefffbc82 Parents: f0fcbc8 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Jul 2 14:43:53 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jul 2 14:43:53 2015 +0100 ---------------------------------------------------------------------- .../file/remote/FtpBadLoginInProducerConnectionLeakTest.java | 1 - .../camel/component/file/remote/FtpConsumerAutoCreateTest.java | 4 ++-- .../component/file/remote/FtpEndpointURISanitizedTest.java | 2 +- .../component/file/remote/sftp/SftpConsumerAutoCreateTest.java | 5 ----- .../camel/component/file/remote/sftp/SftpServerTestSupport.java | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/71406bf9/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java index 837f37c..0d61331 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import javax.net.SocketFactory; -import org.apache.camel.component.file.GenericFileOperationFailedException; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/71406bf9/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java index 79783c1..6422314 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java @@ -41,7 +41,7 @@ public class FtpConsumerAutoCreateTest extends FtpServerTestSupport { @Test public void testAutoCreate() throws Exception { - FtpEndpoint endpoint = (FtpEndpoint) this.getMandatoryEndpoint(getFtpUrl()); + FtpEndpoint<?> endpoint = (FtpEndpoint<?>) this.getMandatoryEndpoint(getFtpUrl()); endpoint.start(); endpoint.getExchanges(); assertTrue(new File("target/res/home/foo/bar/baz/xxx").exists()); @@ -57,7 +57,7 @@ public class FtpConsumerAutoCreateTest extends FtpServerTestSupport { @Test public void testNoAutoCreate() throws Exception { - FtpEndpoint endpoint = (FtpEndpoint) this.getMandatoryEndpoint(getFtpUrl() + "&autoCreate=false"); + FtpEndpoint<?> endpoint = (FtpEndpoint<?>) this.getMandatoryEndpoint(getFtpUrl() + "&autoCreate=false"); endpoint.start(); try { endpoint.getExchanges(); http://git-wip-us.apache.org/repos/asf/camel/blob/71406bf9/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java index 52455f2..6084a1e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java @@ -38,7 +38,7 @@ public class FtpEndpointURISanitizedTest extends FtpServerTestSupport { @Test public void testFtpDirectoryRelative() throws Exception { Endpoint endpoint = context.getEndpoint(getFtpUrl()); - assertThat(((FtpEndpoint) endpoint).getConfiguration().getDirectoryName(), equalTo("foo")); + assertThat(((FtpEndpoint<?>) endpoint).getConfiguration().getDirectoryName(), equalTo("foo")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/71406bf9/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java index 11386c6..97bbc52 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java @@ -20,15 +20,10 @@ import java.io.File; import org.apache.camel.Exchange; import org.apache.camel.component.file.GenericFileOperationFailedException; -import org.apache.camel.component.file.remote.FtpEndpoint; -import org.apache.camel.component.file.remote.FtpServerTestSupport; -import org.apache.camel.component.file.remote.FtpsEndpoint; import org.apache.camel.component.file.remote.SftpEndpoint; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; - /** * @version */ http://git-wip-us.apache.org/repos/asf/camel/blob/71406bf9/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java index 72d09f4..76641d5 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java @@ -51,7 +51,6 @@ public class SftpServerTestSupport extends BaseServerTestSupport { setUpServer(); } - @SuppressWarnings("unchecked") protected void setUpServer() throws Exception { canTest = true; try {
