This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3fa816071a182f52f053ca35b0b43262f09d30ef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 6 10:02:44 2019 +0200
CAMEL-9971: Added appendChars option to file component.
---
.../camel-ftp/src/main/docs/ftps-component.adoc | 6 +-
.../camel/component/file/remote/FtpEndpoint.java | 2 +-
.../camel/component/file/remote/FtpsEndpoint.java | 3 +-
.../camel/component/file/remote/SftpEndpoint.java | 2 +-
.../apache/camel/component/scp/ScpEndpoint.java | 2 +-
.../endpoint/dsl/FtpsEndpointBuilderFactory.java | 132 ---------------------
6 files changed, 6 insertions(+), 141 deletions(-)
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc
b/components/camel-ftp/src/main/docs/ftps-component.adoc
index 4722341..726cb2a 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -61,7 +61,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (122 parameters):
+=== Query Parameters (118 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -151,10 +151,6 @@ with the following path and query parameters:
| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
-| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
-| *readLockIdempotentRelease AsyncPoolSize* (lock) | The number of threads in
the scheduled thread pool when using asynchronous release tasks. Using a
default of 1 core threads should be sufficient in almost all use-cases, only
set this to a higher value if either updating the idempotent repository is
slow, or there are a lot of files to process. This option is not in-use if you
use a shared thread pool by configuring the
readLockIdempotentReleaseExecutorService option. See more details [...]
-| *readLockIdempotentRelease Delay* (lock) | Whether to delay the release task
for a period of millis. This can be used to delay the release tasks to expand
the window when a file is regarded as read-locked, in an active/active cluster
scenario with a shared idempotent repository, to ensure other nodes cannot
potentially scan and acquire the same file, due to race-conditions. By
expanding the time-window of the release tasks helps prevents these situations.
Note delaying is only needed i [...]
-| *readLockIdempotentRelease ExecutorService* (lock) | To use a custom and
shared thread pool for asynchronous release tasks. See more details at the
readLockIdempotentReleaseDelay option. | | ScheduledExecutor Service
| *readLockLoggingLevel* (lock) | Logging level used when a read lock could
not be acquired. By default a DEBUG is logged. You can change this level, for
example to OFF to not have any logging. This option is only applicable for
readLock of types: changed, fileLock, idempotent, idempotent-changed,
idempotent-rename, rename. | DEBUG | LoggingLevel
| *readLockMarkerFile* (lock) | Whether to use marker file with the changed,
rename, or exclusive read lock types. By default a marker file is used as well
to guard against other processes picking up the same files. This behavior can
be turned off by setting this option to false. For example if you do not want
to write marker files to the file systems by the Camel application. | true |
boolean
| *readLockMinAge* (lock) | This option is applied only for readLock=changed.
It allows to specify a minimum age the file must be before attempting to
acquire the read lock. For example use readLockMinAge=300s to require the file
is at last 5 minutes old. This can speedup the changed read lock as it will
only attempt to acquire files which are at least that given age. | 0 | long
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 87fbdd3..649688a 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
@@ -44,7 +44,7 @@ import org.apache.commons.net.ftp.FTPFile;
@UriEndpoint(firstVersion = "1.1.0", scheme = "ftp", extendsScheme = "file",
title = "FTP",
syntax = "ftp:host:port/directoryName", alternativeSyntax =
"ftp:username:password@host:port/directoryName",
label = "file",
- excludeProperties =
"readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService")
+ excludeProperties =
"appendChars,readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService")
@ManagedResource(description = "Managed FtpEndpoint")
public class FtpEndpoint<T extends FTPFile> extends
RemoteFileEndpoint<FTPFile> {
protected int soTimeout;
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 7862cd6..a89ae92 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
@@ -42,7 +42,8 @@ import org.apache.commons.net.ftp.FTPSClient;
*/
@UriEndpoint(firstVersion = "2.2.0", scheme = "ftps", extendsScheme = "file",
title = "FTPS",
syntax = "ftps:host:port/directoryName", alternativeSyntax =
"ftps:username:password@host:port/directoryName",
- label = "file")
+ label = "file",
+ excludeProperties =
"appendChars,readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService")
@ManagedResource(description = "Managed FtpsEndpoint")
public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
@UriParam
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
index 31b0c9e9..4f20cfc 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.UriParam;
*/
@UriEndpoint(firstVersion = "1.1.0", scheme = "sftp", extendsScheme = "file",
title = "SFTP",
syntax = "sftp:host:port/directoryName", label = "file",
- excludeProperties = "binary,passiveMode,receiveBufferSize,siteCommand")
+ excludeProperties =
"appendChars,binary,passiveMode,receiveBufferSize,siteCommand")
public class SftpEndpoint extends RemoteFileEndpoint<SftpRemoteFile> {
@UriParam
diff --git
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
index e1b9954..d136059 100644
---
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
+++
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.UriParam;
*/
@UriEndpoint(firstVersion = "2.10.0", scheme = "scp", extendsScheme = "ftp",
title = "SCP",
syntax = "scp:host:port/directoryName", producerOnly = true, label =
"file",
- excludeProperties =
"binary,charset,doneFileName,download,fastExistsCheck,fileExist,moveExisting,passiveMode"
+ excludeProperties =
"appendChars,binary,charset,doneFileName,download,fastExistsCheck,fileExist,moveExisting,passiveMode"
+
",separator,tempFileName,tempPrefix,eagerDeleteTargetFile,keepLastModified,sendNoop"
+
",maximumReconnectAttempts,reconnectDelay,autoCreate,bufferSize,siteCommand,stepwise,throwExceptionOnConnectFailed")
public class ScpEndpoint extends RemoteFileEndpoint<ScpFile> {
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index de80991..c27dbc0 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -1173,138 +1173,6 @@ public interface FtpsEndpointBuilderFactory {
return this;
}
/**
- * Whether the delayed release task should be synchronous or
- * asynchronous. See more details at the readLockIdempotentReleaseDelay
- * option.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder readLockIdempotentReleaseAsync(
- boolean readLockIdempotentReleaseAsync) {
- setProperty("readLockIdempotentReleaseAsync",
readLockIdempotentReleaseAsync);
- return this;
- }
- /**
- * Whether the delayed release task should be synchronous or
- * asynchronous. See more details at the readLockIdempotentReleaseDelay
- * option.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder readLockIdempotentReleaseAsync(
- String readLockIdempotentReleaseAsync) {
- setProperty("readLockIdempotentReleaseAsync",
readLockIdempotentReleaseAsync);
- return this;
- }
- /**
- * The number of threads in the scheduled thread pool when using
- * asynchronous release tasks. Using a default of 1 core threads should
- * be sufficient in almost all use-cases, only set this to a higher
- * value if either updating the idempotent repository is slow, or there
- * are a lot of files to process. This option is not in-use if you use
a
- * shared thread pool by configuring the
- * readLockIdempotentReleaseExecutorService option. See more details at
- * the readLockIdempotentReleaseDelay option.
- *
- * The option is a: <code>int</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder
readLockIdempotentReleaseAsyncPoolSize(
- int readLockIdempotentReleaseAsyncPoolSize) {
- setProperty("readLockIdempotentReleaseAsyncPoolSize",
readLockIdempotentReleaseAsyncPoolSize);
- return this;
- }
- /**
- * The number of threads in the scheduled thread pool when using
- * asynchronous release tasks. Using a default of 1 core threads should
- * be sufficient in almost all use-cases, only set this to a higher
- * value if either updating the idempotent repository is slow, or there
- * are a lot of files to process. This option is not in-use if you use
a
- * shared thread pool by configuring the
- * readLockIdempotentReleaseExecutorService option. See more details at
- * the readLockIdempotentReleaseDelay option.
- *
- * The option will be converted to a <code>int</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder
readLockIdempotentReleaseAsyncPoolSize(
- String readLockIdempotentReleaseAsyncPoolSize) {
- setProperty("readLockIdempotentReleaseAsyncPoolSize",
readLockIdempotentReleaseAsyncPoolSize);
- return this;
- }
- /**
- * Whether to delay the release task for a period of millis. This can
be
- * used to delay the release tasks to expand the window when a file is
- * regarded as read-locked, in an active/active cluster scenario with a
- * shared idempotent repository, to ensure other nodes cannot
- * potentially scan and acquire the same file, due to race-conditions.
- * By expanding the time-window of the release tasks helps prevents
- * these situations. Note delaying is only needed if you have
configured
- * readLockRemoveOnCommit to true.
- *
- * The option is a: <code>int</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder readLockIdempotentReleaseDelay(
- int readLockIdempotentReleaseDelay) {
- setProperty("readLockIdempotentReleaseDelay",
readLockIdempotentReleaseDelay);
- return this;
- }
- /**
- * Whether to delay the release task for a period of millis. This can
be
- * used to delay the release tasks to expand the window when a file is
- * regarded as read-locked, in an active/active cluster scenario with a
- * shared idempotent repository, to ensure other nodes cannot
- * potentially scan and acquire the same file, due to race-conditions.
- * By expanding the time-window of the release tasks helps prevents
- * these situations. Note delaying is only needed if you have
configured
- * readLockRemoveOnCommit to true.
- *
- * The option will be converted to a <code>int</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder readLockIdempotentReleaseDelay(
- String readLockIdempotentReleaseDelay) {
- setProperty("readLockIdempotentReleaseDelay",
readLockIdempotentReleaseDelay);
- return this;
- }
- /**
- * To use a custom and shared thread pool for asynchronous release
- * tasks. See more details at the readLockIdempotentReleaseDelay
option.
- *
- * The option is a:
- * <code>java.util.concurrent.ScheduledExecutorService</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder
readLockIdempotentReleaseExecutorService(
- ScheduledExecutorService
readLockIdempotentReleaseExecutorService) {
- setProperty("readLockIdempotentReleaseExecutorService",
readLockIdempotentReleaseExecutorService);
- return this;
- }
- /**
- * To use a custom and shared thread pool for asynchronous release
- * tasks. See more details at the readLockIdempotentReleaseDelay
option.
- *
- * The option will be converted to a
- * <code>java.util.concurrent.ScheduledExecutorService</code> type.
- *
- * Group: lock
- */
- default FtpsEndpointConsumerBuilder
readLockIdempotentReleaseExecutorService(
- String readLockIdempotentReleaseExecutorService) {
- setProperty("readLockIdempotentReleaseExecutorService",
readLockIdempotentReleaseExecutorService);
- return this;
- }
- /**
* Logging level used when a read lock could not be acquired. By
default
* a DEBUG is logged. You can change this level, for example to OFF to
* not have any logging. This option is only applicable for readLock of
