You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/08/19 13:25:15 UTC
[camel] branch camel-3.7.x updated (86cba34 -> 92430ad)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 86cba34 Polish and cleanup documentation
new 21b80f4 CAMEL-16874: fix bug with sendEmptyMessages and pollEnrich (#5962)
new 92430ad Polish and cleanup documentation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../component/file/GenericFilePollingConsumer.java | 2 +
.../main/docs/modules/eips/pages/rollback-eip.adoc | 3 +-
.../modules/eips/pages/transactional-client.adoc | 3 +-
.../FileConsumePollEnrichFileIdleEventTest.java | 80 ++++++++++++++++++++++
4 files changed, 84 insertions(+), 4 deletions(-)
create mode 100644 core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileIdleEventTest.java
[camel] 01/02: CAMEL-16874: fix bug with sendEmptyMessages and
pollEnrich (#5962)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 21b80f4e784724f807d877fe831ac0b0329c20ae
Author: klease <38...@users.noreply.github.com>
AuthorDate: Thu Aug 19 15:21:50 2021 +0200
CAMEL-16874: fix bug with sendEmptyMessages and pollEnrich (#5962)
* CAMEL-16874: fix bug with sendEmptyMessages and pollEnrich
* Remove commented out lines in unit test
---
.../component/file/GenericFilePollingConsumer.java | 2 +
.../FileConsumePollEnrichFileIdleEventTest.java | 80 ++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
index 7c5bf6c..ac00878 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
@@ -146,6 +146,8 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
if (polledMessages == 0 && sendEmptyMessageWhenIdle) {
// send an "empty" exchange
processEmptyMessage();
+ // set polledMessages=1 since the empty message is queued
+ polledMessages = 1;
} else if (polledMessages == 0 && timeout > 0) {
// if we did not poll a file and we are using
// timeout then try to poll again
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileIdleEventTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileIdleEventTest.java
new file mode 100644
index 0000000..98e2267
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileIdleEventTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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 org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class FileConsumePollEnrichFileIdleEventTest extends ContextTestSupport {
+
+ @Test
+ public void testNonEmptyAfterEmpty() throws Exception {
+ getMockEndpoint("mock:start").expectedBodiesReceived("Event1", "Event2");
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Event1", "EnrichData");
+ mock.expectedFileExists(testFile("enrich/.done/Event1.txt"));
+ mock.expectedFileExists(testFile("enrich/.done/Event2.txt"));
+ mock.expectedFileExists(testFile("enrichdata/.done/AAA.dat"));
+
+ template.sendBodyAndHeader(fileUri("enrich"), "Event1", Exchange.FILE_NAME,
+ "Event1.txt");
+
+ log.info("Sleeping for 1 sec before writing enrichdata file");
+ Thread.sleep(1000);
+ template.sendBodyAndHeader(fileUri("enrichdata"), "EnrichData",
+ Exchange.FILE_NAME, "AAA.dat");
+ // Trigger second event which should find the EnrichData file
+ template.sendBodyAndHeader(fileUri("enrich"), "Event2", Exchange.FILE_NAME,
+ "Event2.txt");
+ log.info("... write done");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testPollEmptyEnrich() throws Exception {
+ getMockEndpoint("mock:start").expectedBodiesReceived("Event1");
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Event1");
+ mock.expectedFileExists(testFile("enrich/.done/Event1.txt"));
+
+ template.sendBodyAndHeader(fileUri("enrich"), "Event1", Exchange.FILE_NAME,
+ "Event1.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from(fileUri("enrich?initialDelay=0&delay=10&move=.done"))
+ .to("mock:start")
+ .pollEnrich(
+ fileUri("enrichdata?initialDelay=0&delay=10&move=.done&sendEmptyMessageWhenIdle=true"), 1000)
+ .to("mock:result");
+ }
+ };
+ }
+
+}
[camel] 02/02: Polish and cleanup documentation
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 92430ad38073dd12dbab5c75d6b3ea78d737d78a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 19 15:24:12 2021 +0200
Polish and cleanup documentation
---
.../src/main/docs/modules/eips/pages/rollback-eip.adoc | 3 +--
.../src/main/docs/modules/eips/pages/transactional-client.adoc | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
index 3bfff96..c9a828d 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
@@ -118,8 +118,7 @@ from("activemq:queue:foo").policy(notsupported).to("activemq:queue:bar");
=== OSGi Blueprint
-If you are using xref:latest@manual:ROOT:using-osgi-blueprint-with-camel.adoc[OSGi
-Blueprint] then you most likely have to explicit declare a policy and
+If you are using OSGi Blueprint then you most likely have to explicit declare a policy and
refer to the policy from the transacted in the route.
[source,xml]
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
index 65c6a9c..5ee4546 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
@@ -109,8 +109,7 @@ from("activemq:queue:foo").policy(notsupported)
[[TransactionalClient-OSGiBlueprint]]
== OSGi Blueprint
-If you are using
-xref:latest@manual:ROOT:using-osgi-blueprint-with-camel.adoc[OSGi Blueprint]
+If you are using OSGi Blueprint
then you most likely have to explicit declare a policy and
refer to the policy from the transacted in the route.