camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-9131: Add more labels to Camel components for options.
Date Mon, 21 Sep 2015 12:03:54 GMT
Repository: camel
Updated Branches:
  refs/heads/master 2a49466d3 -> 2ecd7359a


CAMEL-9131: Add more labels to Camel components for options.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ecd7359
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ecd7359
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ecd7359

Branch: refs/heads/master
Commit: 2ecd7359ad3e8005b5b21427875e1613465811b5
Parents: 2a49466
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Sep 21 14:05:21 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Sep 21 14:05:21 2015 +0200

----------------------------------------------------------------------
 .../component/file/remote/FtpConfiguration.java |  2 +-
 .../component/file/remote/FtpEndpoint.java      |  6 ++----
 .../file/remote/FtpsConfiguration.java          | 10 ++++-----
 .../component/file/remote/FtpsEndpoint.java     |  7 ++-----
 .../file/remote/RemoteFileConfiguration.java    | 12 +++++------
 .../file/remote/SftpConfiguration.java          | 22 ++++++++++----------
 6 files changed, 27 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConfiguration.java
index f2eb42e..9e5aeb0 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConfiguration.java
@@ -29,7 +29,7 @@ public class FtpConfiguration extends RemoteFileConfiguration {
 
     public static final int DEFAULT_FTP_PORT = 21;
 
-    @UriParam
+    @UriParam(label = "security")
     private String account;
 
     public FtpConfiguration() {

http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
index 330c260..6f1b025 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
@@ -43,12 +43,10 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
     protected FTPClientConfig ftpClientConfig;
     protected Map<String, Object> ftpClientParameters;
     protected Map<String, Object> ftpClientConfigParameters;
-    @UriParam
-    protected FtpConfiguration configuration;
-    @UriParam
     protected int soTimeout;
-    @UriParam
     protected int dataTimeout;
+    @UriParam
+    protected FtpConfiguration configuration;
 
     public FtpEndpoint() {
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
index d5e135f..352c1ab 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
@@ -29,15 +29,15 @@ import org.apache.camel.spi.UriParams;
 @UriParams
 public class FtpsConfiguration extends FtpConfiguration {
 
-    @UriParam(defaultValue = "TLS")
+    @UriParam(defaultValue = "TLS", label = "security")
     private String securityProtocol = "TLS";
-    @UriParam
+    @UriParam(label = "security")
     private boolean isImplicit;
-    @UriParam
+    @UriParam(label = "security")
     private boolean disableSecureDataChannelDefaults;
-    @UriParam
+    @UriParam(label = "security")
     private String execProt;
-    @UriParam
+    @UriParam(label = "security")
     private Long execPbsz;
 
     public FtpsConfiguration() {

http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
index ba90af0..111aae7 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
@@ -48,6 +48,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
     protected FtpsConfiguration configuration;
     protected Map<String, Object> ftpClientKeyStoreParameters;
     protected Map<String, Object> ftpClientTrustStoreParameters;
+    @UriParam(label = "security")
     protected SSLContextParameters sslContextParameters;
 
     public FtpsEndpoint() {
@@ -67,7 +68,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
      * Create the FTPS client.
      */
     protected FTPClient createFtpClient() throws Exception {
-        FTPSClient client = null;
+        FTPSClient client;
         
         if (sslContextParameters != null) {
             SSLContext context = sslContextParameters.createSSLContext();
@@ -206,8 +207,6 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
 
     /**
      * Returns the FTPSClient. This method exists only for convenient.
-     * 
-     * @return ftpsClient
      */
     public FTPSClient getFtpsClient() {
         return (FTPSClient) getFtpClient();
@@ -215,8 +214,6 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
     
     /**
      * Returns the FtpsConfiguration. This method exists only for convenient.
-     * 
-     * @return ftpsConfiguration
      */
     public FtpsConfiguration getFtpsConfiguration() {
         return (FtpsConfiguration) getConfiguration();

http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index 44e086d..4f22d09 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -46,9 +46,9 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration
{
     private int port;
     @UriPath(name = "directoryName")
     private String directoryName;
-    @UriParam
+    @UriParam(label = "security")
     private String username;
-    @UriParam
+    @UriParam(label = "security")
     private String password;
     @UriParam
     private boolean binary;
@@ -60,7 +60,7 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration
{
     private int timeout = 30000;
     @UriParam(defaultValue = "300000")
     private int soTimeout = 300000;
-    @UriParam(defaultValue = "32768")
+    @UriParam(defaultValue = "32768", label = "consumer")
     private int receiveBufferSize = 32 * 1024;
     @UriParam
     private boolean throwExceptionOnConnectFailed;
@@ -70,11 +70,11 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration
{
     private boolean stepwise = true;
     @UriParam(defaultValue = "UNIX")
     private PathSeparator separator = PathSeparator.UNIX;
-    @UriParam
+    @UriParam(label = "consumer")
     private boolean streamDownload;
-    @UriParam(defaultValue = "true")
+    @UriParam(defaultValue = "true", label = "consumer")
     private boolean useList = true;
-    @UriParam
+    @UriParam(label = "consumer")
     private boolean ignoreFileNotFoundOrPermissionError;
     @UriParam(label = "producer", defaultValue = "true")
     private boolean sendNoop = true;

http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd7359/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index 9171b93..633b44d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -31,34 +31,34 @@ public class SftpConfiguration extends RemoteFileConfiguration {
 
     public static final int DEFAULT_SFTP_PORT = 22;
 
-    @UriParam
+    @UriParam(label = "security")
     private String knownHostsFile;
-    @UriParam
+    @UriParam(label = "security")
     private String knownHostsUri;
     private byte[] knownHosts;
-    @UriParam
+    @UriParam(label = "security")
     private String privateKeyFile;
-    @UriParam
+    @UriParam(label = "security")
     private String privateKeyUri;
     private byte[] privateKey;
-    @UriParam
+    @UriParam(label = "security")
     private String privateKeyPassphrase;
     private KeyPair keyPair;
-    @UriParam(defaultValue = "no", enums = "no,yes")
+    @UriParam(defaultValue = "no", enums = "no,yes", label = "security")
     private String strictHostKeyChecking = "no";
-    @UriParam
+    @UriParam(label = "advanced")
     private int serverAliveInterval;
-    @UriParam(defaultValue = "1")
+    @UriParam(defaultValue = "1", label = "advanced")
     private int serverAliveCountMax = 1;
     @UriParam
     private String chmod;
     // comma separated list of ciphers. 
     // null means default jsch list will be used
-    @UriParam
+    @UriParam(label = "security")
     private String ciphers;
-    @UriParam
+    @UriParam(label = "advanced")
     private int compression;
-    @UriParam
+    @UriParam(label = "security")
     private String preferredAuthentications;
     @UriParam(defaultValue = "WARN")
     private LoggingLevel jschLoggingLevel = LoggingLevel.WARN;


Mime
View raw message