This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 14e66527714 CAMEL-21352: smb update housekeeping (#16707)
14e66527714 is described below
commit 14e665277146778f89a79bb8bf7367a6571a2e8b
Author: Jono Morris <j...@apache.org>
AuthorDate: Mon Jan 6 05:24:56 2025 +1300
CAMEL-21352: smb update housekeeping (#16707)
* CAMEL-21352 add note to 4_10 upgrade guide
* CAMEL-21352 allow time for test setup
---
.../apache/camel/component/smb/FromSmbFileSortByExpressionIT.java | 2 +-
.../camel/component/smb/FromSmbRemoteFileFilterDirectoryIT.java | 2 +-
.../org/apache/camel/component/smb/FromSmbRemoteFileFilterIT.java | 2 +-
.../org/apache/camel/component/smb/FromSmbRemoteFileSorterIT.java | 2 +-
.../camel/component/smb/SmbConsumerDirectoriesNotMatchedIT.java | 2 +-
.../org/apache/camel/component/smb/SmbConsumerExcludeExtIT.java | 2 +-
.../org/apache/camel/component/smb/SmbConsumerExcludeNameIT.java | 2 +-
.../component/smb/SmbConsumerIdempotentKeyChangedIssueIT.java | 1 -
.../org/apache/camel/component/smb/SmbConsumerIncludeExtIT.java | 2 +-
.../org/apache/camel/component/smb/SmbRecursiveMaxDepthIT.java | 2 +-
.../org/apache/camel/component/smb/SmbRecursiveMinDepthIT.java | 2 +-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_10.adoc | 8 +++++++-
12 files changed, 17 insertions(+), 12 deletions(-)
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbFileSortByExpressionIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbFileSortByExpressionIT.java
index 0c3f60235f0..9906deb638e 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbFileSortByExpressionIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbFileSortByExpressionIT.java
@@ -24,7 +24,7 @@ public class FromSmbFileSortByExpressionIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/sortby&sortBy=file:ext",
+
"smb:%s/%s?username=%s&password=%s&path=/sortby&sortBy=file:ext&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterDirectoryIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterDirectoryIT.java
index d7bdb7e9aee..d3297da809b 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterDirectoryIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterDirectoryIT.java
@@ -30,7 +30,7 @@ public class FromSmbRemoteFileFilterDirectoryIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/myfilterdir&recursive=true&filter=#myFilter",
+
"smb:%s/%s?username=%s&password=%s&path=/myfilterdir&recursive=true&filter=#myFilter&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterIT.java
index 63e7ef956fc..ecdf31e52c4 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileFilterIT.java
@@ -30,7 +30,7 @@ public class FromSmbRemoteFileFilterIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/myfilter&searchPattern=*&filter=#myFilter",
+
"smb:%s/%s?username=%s&password=%s&path=/myfilter&searchPattern=*&filter=#myFilter&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileSorterIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileSorterIT.java
index 6c0345ff109..38c2c6e9cf6 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileSorterIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbRemoteFileSorterIT.java
@@ -31,7 +31,7 @@ public class FromSmbRemoteFileSorterIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/sorter&sorter=#mySorter",
+
"smb:%s/%s?username=%s&password=%s&path=/sorter&sorter=#mySorter&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerDirectoriesNotMatchedIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerDirectoriesNotMatchedIT.java
index c1c1baff70d..e37cc154e16 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerDirectoriesNotMatchedIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerDirectoriesNotMatchedIT.java
@@ -24,7 +24,7 @@ public class SmbConsumerDirectoriesNotMatchedIT extends
SmbServerTestSupport {
private String getSbmUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/dirnotmatched&recursive=true&delete=true&include=^.*txt$",
+
"smb:%s/%s?username=%s&password=%s&path=/dirnotmatched&recursive=true&delete=true&initialDelay=3000&include=^.*txt$",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeExtIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeExtIT.java
index 7ea2dc3ec67..aaa27acb9a9 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeExtIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeExtIT.java
@@ -24,7 +24,7 @@ public class SmbConsumerExcludeExtIT extends
SmbServerTestSupport {
private String getSbmUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/excludeext&excludeExt=xml",
+
"smb:%s/%s?username=%s&password=%s&path=/excludeext&excludeExt=xml&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeNameIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeNameIT.java
index ef9e9f049bd..31a64e380b9 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeNameIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerExcludeNameIT.java
@@ -24,7 +24,7 @@ public class SmbConsumerExcludeNameIT extends
SmbServerTestSupport {
private String getSbmUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/dirnotmatched&recursive=true&delete=true&include=report.*&exclude=.*xml",
+
"smb:%s/%s?username=%s&password=%s&path=/dirnotmatched&recursive=true&delete=true&include=report.*&exclude=.*xml&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIdempotentKeyChangedIssueIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIdempotentKeyChangedIssueIT.java
index d1b51a56b48..a3440841373 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIdempotentKeyChangedIssueIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIdempotentKeyChangedIssueIT.java
@@ -51,7 +51,6 @@ public class SmbConsumerIdempotentKeyChangedIssueIT extends
SmbServerTestSupport
MockEndpoint.resetMocks(context);
getMockEndpoint("mock:file").expectedBodiesReceived("Hello World
Again");
- // TODO remove 'file-exists'
template.sendBodyAndHeaders(endpoint, "Hello World Again",
Map.of(Exchange.FILE_NAME, "hello.txt",
SmbConstants.SMB_FILE_EXISTS,
GenericFileExist.Override.name()));
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIncludeExtIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIncludeExtIT.java
index 8d4b37721db..f073f5494c8 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIncludeExtIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerIncludeExtIT.java
@@ -24,7 +24,7 @@ public class SmbConsumerIncludeExtIT extends
SmbServerTestSupport {
private String getSbmUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/includeext&includeExt=txt,dat",
+
"smb:%s/%s?username=%s&password=%s&path=/includeext&includeExt=txt,dat&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMaxDepthIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMaxDepthIT.java
index e6768c86f0d..89426af3f3c 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMaxDepthIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMaxDepthIT.java
@@ -30,7 +30,7 @@ public class SmbRecursiveMaxDepthIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/uploadmax&recursive=true&maxdepth=3",
+
"smb:%s/%s?username=%s&password=%s&path=/uploadmax&recursive=true&maxdepth=3&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMinDepthIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMinDepthIT.java
index f669667d924..b222772e479 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMinDepthIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbRecursiveMinDepthIT.java
@@ -30,7 +30,7 @@ public class SmbRecursiveMinDepthIT extends
SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/uploadmin&recursive=true&mindepth=3",
+
"smb:%s/%s?username=%s&password=%s&path=/uploadmin&recursive=true&mindepth=3&initialDelay=3000",
service.address(), service.shareName(), service.userName(),
service.password());
}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_10.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_10.adoc
index 15967b5e341..453f12fd47a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_10.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_10.adoc
@@ -50,4 +50,10 @@ We have deprecated the setting of MDC `trace_id` and
`span_id` in favour of impl
=== camel-langchain4j-chat
-The function calling feature was removed. Please use the
`camel-langchain4j-tools` component for function calling.
\ No newline at end of file
+The function calling feature was removed. Please use the
`camel-langchain4j-tools` component for function calling.
+
+=== camel-smb
+
+The `camel-smb` component has been updated to extend `GenericFile` classes and
now supports more consumer and producer options.
+The Consumer includes options for filtering, pre and post processing,
duplicate handling, directory traversal, polling, and readlocks.
+The Producer includes options for writing to temporary files, writing content,
and handling existing files.
