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 8a04ab4784e CAMEL-21352: camel-smb - More stuff
8a04ab4784e is described below
commit 8a04ab4784edda7fb67543f2d75fc3c3f0d7b7d8
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jan 6 11:51:27 2025 +0100
CAMEL-21352: camel-smb - More stuff
---
.../services/org/apache/camel/send-dynamic/smb | 2 ++
.../smb/SmbDefaultMoveExistingFileStrategy.java | 2 +-
.../camel/component/smb/SmbSendDynamicAware.java | 24 ++++++++++++++++++++++
...ngIT.java => SmbProducerToDMoveExistingIT.java} | 21 +++++++++----------
.../component/smb/SmbProducerToMoveExistingIT.java | 10 ++++-----
5 files changed, 41 insertions(+), 18 deletions(-)
diff --git
a/components/camel-smb/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/smb
b/components/camel-smb/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/smb
new file mode 100644
index 00000000000..a63286104d2
--- /dev/null
+++
b/components/camel-smb/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/smb
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.smb.SmbSendDynamicAware
diff --git
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbDefaultMoveExistingFileStrategy.java
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbDefaultMoveExistingFileStrategy.java
index 0c4992ae3f8..e58e80cd0c0 100644
---
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbDefaultMoveExistingFileStrategy.java
+++
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbDefaultMoveExistingFileStrategy.java
@@ -84,7 +84,7 @@ public class SmbDefaultMoveExistingFileStrategy implements
FileMoveExistingStrat
} else {
throw new GenericFileOperationFailedException(
"Cannot move existing file from: " + fileName + " to:
" + to + " as there already exists a file: "
- + to);
+ + to);
}
}
diff --git
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbSendDynamicAware.java
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbSendDynamicAware.java
new file mode 100644
index 00000000000..279072ba578
--- /dev/null
+++
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbSendDynamicAware.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.smb;
+
+import org.apache.camel.component.file.GenericFileSendDynamicAware;
+import org.apache.camel.spi.annotations.SendDynamic;
+
+@SendDynamic("smb")
+public class SmbSendDynamicAware extends GenericFileSendDynamicAware {
+}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToDMoveExistingIT.java
similarity index 79%
copy from
components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
copy to
components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToDMoveExistingIT.java
index a185b9bc710..68876163be4 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToDMoveExistingIT.java
@@ -16,38 +16,38 @@
*/
package org.apache.camel.component.smb;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SmbProducerToMoveExistingIT extends SmbServerTestSupport {
+public class SmbProducerToDMoveExistingIT extends SmbServerTestSupport {
protected String getSmbUrl() {
return String.format(
-
"smb:%s/%s?username=%s&password=%s&path=/toMoveExisting&fileExist=Move&moveExisting=old-${file:onlyname}",
+
"smb:%s/%s?username=%s&password=%s&path=${header.myDir}&fileExist=Move&moveExisting=old-${file:onlyname}",
service.address(), service.shareName(), service.userName(),
service.password());
}
@Test
- public void testMoveExisting() throws Exception {
+ public void testToDMoveExisting() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(2);
Map<String, Object> headers = new HashMap<>();
- headers.put("myDir", "toMoveExisting");
+ headers.put("myDir", "toDMoveExisting");
headers.put(Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeaders("direct:start", "Hello World", headers);
template.sendBodyAndHeaders("direct:start", "Bye World", headers);
MockEndpoint.assertIsSatisfied(context);
- String data = service.smbFile("toMoveExisting/old-hello.txt");
+ String data = service.smbFile("toDMoveExisting/old-hello.txt");
Assertions.assertEquals("Hello World\n", data);
- data = service.smbFile("toMoveExisting/hello.txt");
+ data = service.smbFile("toDMoveExisting/hello.txt");
Assertions.assertEquals("Bye World\n", data);
}
@@ -56,10 +56,9 @@ public class SmbProducerToMoveExistingIT extends
SmbServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start").to(getSmbUrl()).to("mock:result");
+ from("direct:start").toD(getSmbUrl()).to("mock:result");
}
};
}
-
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
index a185b9bc710..615e81c1791 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerToMoveExistingIT.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.smb;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
public class SmbProducerToMoveExistingIT extends SmbServerTestSupport {
protected String getSmbUrl() {
@@ -34,11 +34,10 @@ public class SmbProducerToMoveExistingIT extends
SmbServerTestSupport {
}
@Test
- public void testMoveExisting() throws Exception {
+ public void testToMoveExisting() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(2);
Map<String, Object> headers = new HashMap<>();
- headers.put("myDir", "toMoveExisting");
headers.put(Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeaders("direct:start", "Hello World", headers);
template.sendBodyAndHeaders("direct:start", "Bye World", headers);
@@ -61,5 +60,4 @@ public class SmbProducerToMoveExistingIT extends
SmbServerTestSupport {
};
}
-
}
