This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 679c30597aa8505563cf00fc817d375e91d48584 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Wed Oct 16 13:52:44 2024 +0200 Upgrade of the Smb test because of CAMEL-21277 --- .../org/apache/camel/quarkus/component/smb/it/SmbResource.java | 4 ++-- .../java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java index 241534698c..17794d116f 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.hierynomus.smbj.share.File; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -35,6 +34,7 @@ import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.smb.SmbConstants; +import org.apache.camel.component.smb.SmbFile; import org.eclipse.microprofile.config.inject.ConfigProperty; @Path("/smb") @@ -88,7 +88,7 @@ public class SmbResource { String uri = String.format("smb:%s:%s/%s?username=%s&password=%s&searchPattern=%s&path=/", host, port, share, username, password, fileName); - var shareFile = consumer.receiveBody(uri, File.class); + var shareFile = consumer.receiveBody(uri, SmbFile.class); return new String(shareFile.getInputStream().readAllBytes(), "UTF-8"); } diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java index a101b0b809..e6a566520a 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java @@ -16,12 +16,10 @@ */ package org.apache.camel.quarkus.component.smb.it; -import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import com.hierynomus.smbj.share.File; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; @@ -29,6 +27,7 @@ import jakarta.inject.Named; import jakarta.inject.Singleton; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.smb.SmbConstants; +import org.apache.camel.component.smb.SmbFile; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped @@ -64,8 +63,8 @@ public class SmbRoute extends RouteBuilder { from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&searchPattern=*.tx1") .process(e -> { receivedContents.add(Map.of( - "path", e.getIn().getBody(File.class).getPath(), - "content", new String(e.getIn().getBody(InputStream.class).readAllBytes(), "UTF-8"), + "path", e.getIn().getBody(SmbFile.class).getPath(), + "content", new String(e.getIn().getBody(SmbFile.class).getInputStream().readAllBytes(), "UTF-8"), SmbConstants.SMB_FILE_PATH, e.getIn().getHeader(SmbConstants.SMB_FILE_PATH, String.class), SmbConstants.SMB_UNC_PATH, e.getIn().getHeader(SmbConstants.SMB_UNC_PATH, String.class))); });