(camel) branch main updated: CAMEL-21352: camel-smb - More stuff

[davsclaus]

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 a46dd4b89b1 CAMEL-21352: camel-smb - More stuff
a46dd4b89b1 is described below

commit a46dd4b89b10678ae900f76fc276188b9f16ffaf
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jan 6 12:03:56 2025 +0100

    CAMEL-21352: camel-smb - More stuff
---
 .../apache/camel/component/smb/SmbConsumer.java    | 35 +++++++++++-----------
 .../component/smb/SmbRecursiveMaxDepthIT.java      |  2 +-
 .../component/smb/SmbRecursiveMinDepthIT.java      |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git 
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
 
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
index d8bb8e03fb4..d7131ff6cbe 100644
--- 
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
+++ 
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
@@ -126,16 +126,16 @@ public class SmbConsumer extends 
GenericFileConsumer<FileIdBothDirectoryInformat
             String fullFilePath, 
List<GenericFile<FileIdBothDirectoryInformation>> fileList, int depth,
             FileIdBothDirectoryInformation[] files, 
FileIdBothDirectoryInformation file) {
 
-        SmbFile smbFile = asGenericFile(fullFilePath, file, 
getEndpoint().getCharset());
-        Supplier<GenericFile<FileIdBothDirectoryInformation>> 
genericFileSupplier = Suppliers.memorize(() -> smbFile);
-        Supplier<String> relativePath = smbFile::getRelativeFilePath;
-
-        if (endpoint.isRecursive() && depth < endpoint.getMaxDepth() && 
isValidFile(genericFileSupplier, file.getFileName(),
-                smbFile.getAbsoluteFilePath(), relativePath, true, files)) {
-
-            // recursive scan and add the sub files and folders
-            boolean canPollMore = pollDirectory(fullFilePath, fileList, depth);
-            return !canPollMore;
+        if (endpoint.isRecursive() && depth < endpoint.getMaxDepth()) {
+            SmbFile smbFile = asGenericFile(fullFilePath, file, 
getEndpoint().getCharset());
+            Supplier<GenericFile<FileIdBothDirectoryInformation>> 
genericFileSupplier = Suppliers.memorize(() -> smbFile);
+            Supplier<String> relativePath = smbFile::getRelativeFilePath;
+            if (isValidFile(genericFileSupplier, file.getFileName(),
+                    smbFile.getAbsoluteFilePath(), relativePath, true, files)) 
{
+                // recursive scan and add the sub files and folders
+                boolean canPollMore = pollDirectory(fullFilePath, fileList, 
depth);
+                return !canPollMore;
+            }
         }
         return false;
     }
@@ -144,14 +144,15 @@ public class SmbConsumer extends 
GenericFileConsumer<FileIdBothDirectoryInformat
             String fullFilePath, 
List<GenericFile<FileIdBothDirectoryInformation>> fileList, int depth,
             FileIdBothDirectoryInformation[] files, 
FileIdBothDirectoryInformation file) {
 
-        SmbFile smbFile = asGenericFile(fullFilePath, file, 
getEndpoint().getCharset());
-        Supplier<GenericFile<FileIdBothDirectoryInformation>> 
genericFileSupplier = Suppliers.memorize(() -> smbFile);
-        Supplier<String> relativePath = smbFile::getRelativeFilePath;
+        if (depth >= endpoint.getMinDepth()) {
+            SmbFile smbFile = asGenericFile(fullFilePath, file, 
getEndpoint().getCharset());
+            Supplier<GenericFile<FileIdBothDirectoryInformation>> 
genericFileSupplier = Suppliers.memorize(() -> smbFile);
+            Supplier<String> relativePath = smbFile::getRelativeFilePath;
 
-        if (depth >= endpoint.getMinDepth() && 
isValidFile(genericFileSupplier, file.getFileName(),
-                smbFile.getAbsoluteFilePath(), relativePath, false, files)) {
-
-            fileList.add(smbFile);
+            if (isValidFile(genericFileSupplier, file.getFileName(),
+                    smbFile.getAbsoluteFilePath(), relativePath, false, 
files)) {
+                fileList.add(smbFile);
+            }
         }
     }
 
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 89426af3f3c..c08b662f863 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
@@ -37,7 +37,7 @@ public class SmbRecursiveMaxDepthIT extends 
SmbServerTestSupport {
     @Test
     public void testDirectoryTraversalDepth() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:received_send");
-        mock.expectedBodiesReceived("Goodday", "World");
+        mock.expectedBodiesReceivedInAnyOrder("Goodday", "World");
 
         mock.assertIsSatisfied();
     }
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 b222772e479..e0f1abfc221 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
@@ -37,7 +37,7 @@ public class SmbRecursiveMinDepthIT extends 
SmbServerTestSupport {
     @Test
     public void testDirectoryTraversalDepth() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:received_send");
-        mock.expectedBodiesReceived("Hello");
+        mock.expectedBodiesReceivedInAnyOrder("Hello", "Goodday");
 
         mock.assertIsSatisfied();
     }