camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ond...@apache.org
Subject camel git commit: CAMEL-11524-Add quoteReplacement
Date Mon, 17 Jul 2017 05:14:01 GMT
Repository: camel
Updated Branches:
  refs/heads/camel.2.19.x [created] dc6897fc2


CAMEL-11524-Add quoteReplacement


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc6897fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc6897fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc6897fc

Branch: refs/heads/camel.2.19.x
Commit: dc6897fc2df288d7fe9bad5e46458a2a7ec13fd1
Parents: a0a82de
Author: onders86 <ondersezgin@gmail.com>
Authored: Sat Jul 15 08:33:59 2017 +0300
Committer: onders86 <ondersezgin@gmail.com>
Committed: Mon Jul 17 08:11:35 2017 +0300

----------------------------------------------------------------------
 .../component/file/GenericFileEndpoint.java     |  3 +-
 .../file/FileConsumeDoneFileIssueTest.java      | 30 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dc6897fc/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 0bea0ba..f60b12a 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -23,6 +23,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.camel.CamelContext;
@@ -1316,7 +1317,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint
imple
 
         // we only support ${file:name} or ${file:name.noext} as dynamic placeholders for
done files
         String path = FileUtil.onlyPath(fileName);
-        String onlyName = FileUtil.stripPath(fileName);
+        String onlyName = Matcher.quoteReplacement(FileUtil.stripPath(fileName));
 
         pattern = pattern.replaceFirst("\\$\\{file:name\\}", onlyName);
         pattern = pattern.replaceFirst("\\$simple\\{file:name\\}", onlyName);

http://git-wip-us.apache.org/repos/asf/camel/blob/dc6897fc/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
index 4f05221..19cdd08 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
@@ -89,6 +89,36 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         assertFalse("Done file should be deleted", new File("target/done2/c.txt.done").exists());
         
     }
+    
+    public void testFileDoneFileNameContainingDollarSign() throws Exception {
+        NotifyBuilder notify = new NotifyBuilder(context).whenDone(3).create();
+
+        template.sendBodyAndHeader("file:target/done2", "A", Exchange.FILE_NAME, "$a$.txt");
+        template.sendBodyAndHeader("file:target/done2", "B", Exchange.FILE_NAME, "$b.txt");
+        template.sendBodyAndHeader("file:target/done2", "C", Exchange.FILE_NAME, "c$.txt");
+        template.sendBodyAndHeader("file:target/done2", "a", Exchange.FILE_NAME, "$a$.txt.done");
+        template.sendBodyAndHeader("file:target/done2", "b", Exchange.FILE_NAME, "$b.txt.done");
+        template.sendBodyAndHeader("file:target/done2", "c", Exchange.FILE_NAME, "c$.txt.done");
+        
+        assertTrue("Done file should exists", new File("target/done2/$a$.txt.done").exists());
+        assertTrue("Done file should exists", new File("target/done2/$b.txt.done").exists());
+        assertTrue("Done file should exists", new File("target/done2/c$.txt.done").exists());
+
+        getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("A", "B", "C");
+
+        context.startRoute("bar");
+
+        assertMockEndpointsSatisfied();
+        assertTrue(notify.matchesMockWaitTime());
+
+        Thread.sleep(50);
+
+        // the done file should be deleted
+        assertFalse("Done file should be deleted", new File("target/done2/$a$.txt.done").exists());
+        assertFalse("Done file should be deleted", new File("target/done2/$b.txt.done").exists());
+        assertFalse("Done file should be deleted", new File("target/done2/c$.txt.done").exists());
+        
+    }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {


Mime
View raw message