[camel] branch camel-2.x updated: CAMEL-14127: (2.x port) avoid file by file target replacement when fileExist=Append (#3309) (#3337)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.x by this push:
     new f088551  CAMEL-14127: (2.x port) avoid file by file target replacement when fileExist=Append (#3309) (#3337)
f088551 is described below

commit f08855198808295065c8b54a0599d0b46ca3fb0b
Author: Marco Collovati <mc...@gmail.com>
AuthorDate: Wed Nov 13 22:02:24 2019 +0100

    CAMEL-14127: (2.x port) avoid file by file target replacement when fileExist=Append (#3309) (#3337)
    
    When file producer applies file based optimization it ignores
    fileExist=Append mode and always replaces target file.
    This change avoids file based optimization when fileExist=Append.
---
 .../camel/component/file/FileOperations.java       |  5 +++--
 .../file/FileProducerFileExistAppendTest.java      | 25 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
index db4e3d4..848acf4 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
@@ -262,10 +262,11 @@ public class FileOperations implements GenericFileOperations<File> {
             String charset = endpoint.getCharset();
 
             // we can optimize and use file based if no charset must be used, and the input body is a file
+            // however optimization cannot be applied when content should be appended to target file
             File source = null;
             boolean fileBased = false;
-            if (charset == null) {
-                // if no charset, then we can try using file directly (optimized)
+            if (charset == null && endpoint.getFileExist() != GenericFileExist.Append) {
+                // if no charset and not in appending mode, then we can try using file directly (optimized)
                 Object body = exchange.getIn().getBody();
                 if (body instanceof WrappedFile) {
                     body = ((WrappedFile<?>) body).getFile();
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
index 1e741a3..5d7e42e 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
+
+import java.io.File;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -49,6 +52,26 @@ public class FileProducerFileExistAppendTest extends ContextTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Test
+    public void testAppendFileByFile() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+
+        // Create some test files
+        template.sendBodyAndHeader("file://target/file", "Row 1\n", Exchange.FILE_NAME, "test1.txt");
+        template.sendBodyAndHeader("file://target/file", "Row 2\n", Exchange.FILE_NAME, "test2.txt");
+
+        // Append test files to the target one
+        template.sendBodyAndHeader("file://target/file?fileExist=Append", new File("target/file/test1.txt"), Exchange.FILE_NAME, "out.txt");
+        template.sendBodyAndHeader("file://target/file?fileExist=Append", new File("target/file/test2.txt"), Exchange.FILE_NAME, "out.txt");
+
+        mock.expectedFileExists("target/file/out.txt", "Row 1\nRow 2\n");
+
+        context.startAllRoutes();
+
+        assertMockEndpointsSatisfied();
+
+    }
+
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
@@ -59,4 +82,4 @@ public class FileProducerFileExistAppendTest extends ContextTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}