You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/08/29 16:01:11 UTC

svn commit: r1162815 - in /camel/trunk/components/camel-ftp/src: main/java/org/apache/camel/component/file/remote/ test/java/org/apache/camel/component/file/remote/sftp/

Author: cschneider
Date: Mon Aug 29 14:01:10 2011
New Revision: 1162815

URL: http://svn.apache.org/viewvc?rev=1162815&view=rev
Log:
Fix checkstyle errors

Modified:
    camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
    camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java

Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1162815&r1=1162814&r2=1162815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Mon Aug 29 14:01:10 2011
@@ -544,7 +544,7 @@ public class FtpOperations implements Re
             if (names == null) {
                 return false;
             }
-            return (names.length >= 1);
+            return names.length >= 1;
         } catch (IOException e) {
             throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
         }

Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1162815&r1=1162814&r2=1162815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Mon Aug 29 14:01:10 2011
@@ -140,7 +140,7 @@ public class SftpOperations implements R
 
         if (isNotEmpty(sftpConfig.getCiphers())) {
             LOG.debug("Using ciphers: " + sftpConfig.getCiphers());
-            Hashtable<String,String> ciphers = new Hashtable<String, String>();
+            Hashtable<String, String> ciphers = new Hashtable<String, String>();
             
             ciphers.put("cipher.s2c", sftpConfig.getCiphers());
             ciphers.put("cipher.c2s", sftpConfig.getCiphers());
@@ -722,7 +722,7 @@ public class SftpOperations implements R
             if (files == null) {
                 return false;
             }
-            return (files.size() >= 1);
+            return files.size() >= 1;
         } catch (SftpException e) {
             // or an exception can be thrown with id 2 which means file does not exists
             if (ChannelSftp.SSH_FX_NO_SUCH_FILE == e.id) {

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java?rev=1162815&r1=1162814&r2=1162815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java Mon Aug 29 14:01:10 2011
@@ -41,7 +41,7 @@ public class SftpSetCipherTest extends S
         }
 
         String cipher = "blowfish-cbc";
-        String uri = "sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&ciphers=" + cipher ;
+        String uri = "sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&ciphers=" + cipher;
         template.sendBodyAndHeader(uri , "Hello World", Exchange.FILE_NAME, "hello.txt");
 
         // test setting the cipher doesn't interfere with message payload