[
https://issues.apache.org/jira/browse/CAMEL-12940?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16688464#comment-16688464
]
ASF GitHub Bot commented on CAMEL-12940:
----------------------------------------
aldettinger closed pull request #2620: CAMEL-12940: Fixed an issue where
dynamic doneFileName does not manag…
URL: https://github.com/apache/camel/pull/2620
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 fac9e7e8fbe..c60312375ad 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
@@ -1420,8 +1420,8 @@ protected String createDoneFileName(String fileName) {
pattern = pattern.replaceFirst("\\$\\{file:name\\}", onlyName);
pattern = pattern.replaceFirst("\\$simple\\{file:name\\}", onlyName);
- pattern = pattern.replaceFirst("\\$\\{file:name.noext\\}",
FileUtil.stripExt(onlyName));
- pattern = pattern.replaceFirst("\\$simple\\{file:name.noext\\}",
FileUtil.stripExt(onlyName));
+ pattern = pattern.replaceFirst("\\$\\{file:name.noext\\}",
FileUtil.stripExt(onlyName, true));
+ pattern = pattern.replaceFirst("\\$simple\\{file:name.noext\\}",
FileUtil.stripExt(onlyName, true));
// must be able to resolve all placeholders supported
if (StringHelper.hasStartToken(pattern, "simple")) {
diff --git
a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
new file mode 100644
index 00000000000..a45905a36b4
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
@@ -0,0 +1,68 @@
+/**
+ * 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.file;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class tests an issue where an input file is not picked up due to a
dynamic
+ * doneFileName containing two dots.
+ */
+public class FileConsumeDynamicDoneFileNameWithTwoDotsTest extends
ContextTestSupport {
+
+ private static final String TARGET_DIR_NAME = "target/" +
MethodHandles.lookup().lookupClass().getSimpleName();
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ deleteDirectory(TARGET_DIR_NAME);
+ super.setUp();
+ }
+
+ @Test
+ public void testDynamicDoneFileNameContainingTwoDots() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("input-body");
+
+ template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "input-body",
Exchange.FILE_NAME, "test.twodot.txt");
+ template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "done-body",
Exchange.FILE_NAME, "test.twodot.done");
+
+ assertMockEndpointsSatisfied();
+ assertTrue(notify.matchesMockWaitTime());
+
+ assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME,
"test.twodot.txt").exists());
+ assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME,
"test.twodot.done").exists());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("file:" + TARGET_DIR_NAME +
"?doneFileName=${file:name.noext}.done&initialDelay=0").to("mock:result");
+ }
+ };
+ }
+}
diff --git
a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
new file mode 100644
index 00000000000..d1de7a94bc4
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
@@ -0,0 +1,68 @@
+/**
+ * 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.file;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class tests an issue where an input file is not picked up due to a
+ * dynamic doneFileName using the simple syntax and containing two dots.
+ */
+public class FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest extends
ContextTestSupport {
+
+ private static final String TARGET_DIR_NAME = "target/" +
MethodHandles.lookup().lookupClass().getSimpleName();
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ deleteDirectory(TARGET_DIR_NAME);
+ super.setUp();
+ }
+
+ @Test
+ public void testSimpleDynamicDoneFileNameContainingTwoDots() throws
Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("input-body");
+
+ template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "input-body",
Exchange.FILE_NAME, "test.twodot.txt");
+ template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "done-body",
Exchange.FILE_NAME, "test.twodot.done");
+
+ assertMockEndpointsSatisfied();
+ assertTrue(notify.matchesMockWaitTime());
+
+ assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME,
"test.twodot.txt").exists());
+ assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME,
"test.twodot.done").exists());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("file:" + TARGET_DIR_NAME +
"?doneFileName=$simple{file:name.noext}.done&initialDelay=0").to("mock:result");
+ }
+ };
+ }
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Dynamic doneFileName is not working with filename containing 2 dots
> -------------------------------------------------------------------
>
> Key: CAMEL-12940
> URL: https://issues.apache.org/jira/browse/CAMEL-12940
> Project: Camel
> Issue Type: Bug
> Components: camel-core
> Affects Versions: 2.21.3, 2.22.1, 2.23.0
> Reporter: Alex Dettinger
> Assignee: Alex Dettinger
> Priority: Major
>
> Check [this
> conversation|http://camel.465427.n5.nabble.com/File-polling-issue-for-filename-with-multiple-dots-td5825827.html]
> out for more context.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
