[camel] branch master updated: Fixed test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new bba7b2f Fixed test
bba7b2f is described below
commit bba7b2f4407e668cb75d32ea2e63e9727cbd8e2c
Author: Claus Ibsen
AuthorDate: Fri May 31 07:29:56 2019 +0200
Fixed test
---
.../camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java | 8
.../component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
index a267032..8ce404c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
@@ -44,8 +44,8 @@ public class AsyncEndpointJmsTXMulticastTest extends
CamelSpringTestSupport {
assertMockEndpointsSatisfied();
-// we are asynchronous due to multicast so that we are NOT using same
threads during the routing
-assertFalse("Should not use same threads",
beforeThreadName.equalsIgnoreCase(afterThreadName));
+// we are asynchronous due to multicast so we should ideally use same
thread during processing
+assertTrue("Should use same threads",
beforeThreadName.equalsIgnoreCase(afterThreadName));
}
@Override
@@ -65,7 +65,7 @@ public class AsyncEndpointJmsTXMulticastTest extends
CamelSpringTestSupport {
assertTrue("Exchange should be transacted",
exchange.isTransacted());
}
})
-// if we use mutlicast then we cannot propagate
transactions across
+// if we use mutlicast then we can propagate
transactions across
.multicast().to("direct:foo");
from("direct:foo")
@@ -73,7 +73,7 @@ public class AsyncEndpointJmsTXMulticastTest extends
CamelSpringTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
afterThreadName =
Thread.currentThread().getName();
-assertFalse("Exchange should NO longer be
transacted", exchange.isTransacted());
+assertTrue("Exchange should be transacted",
exchange.isTransacted());
}
})
.to("log:after")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
index dd7778f..02e76f0 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
@@ -44,8 +44,8 @@ public class AsyncEndpointJmsTXRecipientListTest extends
CamelSpringTestSupport
assertMockEndpointsSatisfied();
-// we are asynchronous due to recipientlist so that we are NOT using
same threads during the routing
-assertFalse("Should not use same threads",
beforeThreadName.equalsIgnoreCase(afterThreadName));
+// we are asynchronous due to multicast so we should ideally use same
thread during processing
+assertTrue("Should use same threads",
beforeThreadName.equalsIgnoreCase(afterThreadName));
}
@Override
@@ -72,7 +72,7 @@ public class AsyncEndpointJmsTXRecipientListTest extends
CamelSpringTestSupport
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
afterThreadName =
Thread.currentThread().getName();
-assertFalse("Exchange should NO longer be
transacted", exchange.isTransacted());
+assertTrue("Exchange should be transacted",
exchange.isTransacted());
}
})
.to("log:after")
[camel] branch master updated: Upgrade Apache Pulsar
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c13051d Upgrade Apache Pulsar
c13051d is described below
commit c13051da2460a31a1778f8fa937c293b1e869e65
Author: Claus Ibsen
AuthorDate: Fri May 31 07:20:58 2019 +0200
Upgrade Apache Pulsar
---
components/camel-pulsar/src/main/docs/pulsar-component.adoc| 6 +++---
.../java/org/apache/camel/component/pulsar/PulsarComponent.java| 7 +++
.../org/apache/camel/component/pulsar/PulsarComponentTest.java | 2 +-
.../component/pulsar/springboot/PulsarComponentConfiguration.java | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
index 70ae3b4..58ace4d 100644
--- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
+++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
@@ -35,8 +35,8 @@ The Apache Pulsar component supports 4 options, which are
listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *autoConfiguration* (common) | The pulsar autoconfiguration | |
AutoConfiguration
-| *pulsarClient* (common) | The pulsar client | | PulsarClient
+| *autoConfiguration* (advanced) | The pulsar auto configuration | |
AutoConfiguration
+| *pulsarClient* (advanced) | The pulsar client | | PulsarClient
| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
|===
@@ -76,7 +76,7 @@ with the following path and query parameters:
| *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a
SHARED or FAILOVER subscription is used | cons | String
| *consumerQueueSize* (consumer) | Size of the consumer queue - defaults to 10
| 10 | int
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 |
int
-| *subscriptionName* (consumer) | Name of the subscription to use |
subscription | String
+| *subscriptionName* (consumer) | Name of the subscription to use | subs |
String
| *subscriptionType* (consumer) | Type of the subscription
EXCLUSIVESHAREDFAILOVER, defaults to EXCLUSIVE | EXCLUSIVE | SubscriptionType
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
index e02de5c..7244fdb 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
@@ -35,6 +35,13 @@ public class PulsarComponent extends DefaultComponent {
@Metadata(label = "advanced")
private PulsarClient pulsarClient;
+public PulsarComponent() {
+}
+
+public PulsarComponent(CamelContext context) {
+super(context);
+}
+
@Override
protected Endpoint createEndpoint(final String uri, final String path,
final Map parameters) throws Exception {
final PulsarConfiguration configuration = new PulsarConfiguration();
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
index 620ea2c..7a9adc2 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
@@ -39,7 +39,7 @@ public class PulsarComponentTest extends CamelTestSupport {
@Test
public void testPulsarEndpointConfiguration() throws Exception {
-PulsarComponent component = new PulsarComponent(context);
+PulsarComponent component = new PulsarComponent();
component.setAutoConfiguration(autoConfiguration);
PulsarEndpoint endpoint = (PulsarEndpoint)component
diff --git
[camel] branch master updated: Upgrade Apache Pulsar
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c804906 Upgrade Apache Pulsar
c804906 is described below
commit c80490699134378c49611f66275cba890779b05d
Author: Claus Ibsen
AuthorDate: Fri May 31 07:19:43 2019 +0200
Upgrade Apache Pulsar
---
.../camel/component/pulsar/PulsarComponent.java | 14 +++---
.../pulsar/configuration/PulsarConfiguration.java| 4 ++--
.../camel/component/pulsar/utils/PulsarUtils.java| 20 +---
.../camel/component/pulsar/PulsarTestSupport.java| 2 +-
parent/pom.xml | 4 ++--
5 files changed, 25 insertions(+), 19 deletions(-)
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
index e726203..e02de5c 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java
@@ -30,19 +30,11 @@ import org.apache.pulsar.client.api.PulsarClient;
@Component("pulsar")
public class PulsarComponent extends DefaultComponent {
-@Metadata
+@Metadata(label = "advanced")
private AutoConfiguration autoConfiguration;
-@Metadata
+@Metadata(label = "advanced")
private PulsarClient pulsarClient;
-public PulsarComponent() {
-this(null);
-}
-
-public PulsarComponent(CamelContext context) {
-super(context);
-}
-
@Override
protected Endpoint createEndpoint(final String uri, final String path,
final Map parameters) throws Exception {
final PulsarConfiguration configuration = new PulsarConfiguration();
@@ -64,7 +56,7 @@ public class PulsarComponent extends DefaultComponent {
}
/**
- * The pulsar autoconfiguration
+ * The pulsar auto configuration
*/
public void setAutoConfiguration(AutoConfiguration autoConfiguration) {
this.autoConfiguration = autoConfiguration;
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/configuration/PulsarConfiguration.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/configuration/PulsarConfiguration.java
index 5e76604..8834164 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/configuration/PulsarConfiguration.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/configuration/PulsarConfiguration.java
@@ -25,9 +25,9 @@ import static
org.apache.camel.component.pulsar.utils.consumers.SubscriptionType
@UriParams
public class PulsarConfiguration {
-@UriParam(label = "consumer", defaultValue = "subscription")
+@UriParam(label = "consumer", defaultValue = "subs")
private String subscriptionName = "subs";
-@UriParam(label = "consumer", enums = "EXCLUSIVE, SHARED, FAILOVER",
defaultValue = "EXCLUSIVE")
+@UriParam(label = "consumer", defaultValue = "EXCLUSIVE")
private SubscriptionType subscriptionType = EXCLUSIVE;
@UriParam(label = "consumer", defaultValue = "1")
private int numberOfConsumers = 1;
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
index a4bd1b3..7698152 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
@@ -18,11 +18,16 @@ package org.apache.camel.component.pulsar.utils;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.PulsarClientException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class PulsarUtils {
-
+
+private static final Logger LOG =
LoggerFactory.getLogger(PulsarUtils.class);
+
private PulsarUtils() {
}
@@ -30,8 +35,17 @@ public final class PulsarUtils {
while (!consumers.isEmpty()) {
Consumer consumer = consumers.poll();
if (consumer != null) {
-consumer.unsubscribe();
-consumer.close();
+try {
+consumer.unsubscribe();
+consumer.close();
+} catch (Exception e) {
+// ignore during stopping
+if (e instanceof
PulsarClientException.AlreadyClosedException) {
+// ignore
+} else {
+
[camel] 02/02: Upgrade xercesImpl version
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 56d6fb062c167f94bb0dfa00f6a7f446f9478410 Author: Claus Ibsen AuthorDate: Fri May 31 06:55:33 2019 +0200 Upgrade xercesImpl version --- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 7d7ff5c..89c126d 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -4096,7 +4096,7 @@ xerces xercesImpl -2.11.0 +2.12.0
[camel] 01/02: Upgrade xercesImpl version
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit f9e8f070b2ea2130d472351e2e1792bdccf8d8ab Author: Claus Ibsen AuthorDate: Fri May 31 06:25:11 2019 +0200 Upgrade xercesImpl version --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f0b8354..f9ebf8a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -704,8 +704,8 @@ 3.14 4.5 4.3.18 -2.11.0_1 -2.11.0 +2.12.0_1 +2.12.0 1.4.01 1.3.04
[camel] branch master updated (b03eaca -> 56d6fb0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b03eaca Regen new f9e8f07 Upgrade xercesImpl version new 56d6fb0 Upgrade xercesImpl version 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: parent/pom.xml| 4 ++-- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch 2.20.x deleted (was c0894b1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch 2.20.x in repository https://gitbox.apache.org/repos/asf/camel.git. was c0894b1 CAMEL-12324: Improve docs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch 2.2.1 deleted (was 2685737)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch 2.2.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was 2685737 Upgrade Zookeeper to version 3.4.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch feature/maven-wrapper deleted (was 66f9c28)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch feature/maven-wrapper in repository https://gitbox.apache.org/repos/asf/camel.git. was 66f9c28 Add Maven Wrapper The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch sandbox/camel-3.x deleted (was 3b17a7f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git. was 3b17a7f CAMEL-13014 - Fixed CS The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch CAMEL-12549-olingo2_update deleted (was 833a867)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-12549-olingo2_update in repository https://gitbox.apache.org/repos/asf/camel.git. was 833a867 CAMEL-12549 - upgrade groovy for olingo2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch CAMEL-13002 deleted (was f2458c4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13002 in repository https://gitbox.apache.org/repos/asf/camel.git. was f2458c4 CAMEL-13002 - Fix Karaf features - beginning This change permanently discards the following revisions: discard f2458c4 CAMEL-13002 - Fix Karaf features - beginning
[camel] branch CAMEL-13149 deleted (was dcdf5b7)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13149 in repository https://gitbox.apache.org/repos/asf/camel.git. was dcdf5b7 CAMEL-13149 - Moved all the camel-jms test inside camel-activeMQ to avoid circular deps This change permanently discards the following revisions: discard dcdf5b7 CAMEL-13149 - Moved all the camel-jms test inside camel-activeMQ to avoid circular deps discard 82c5b15 CAMEL-13149 - Make Camel-Itest use Camel-Activemq instead of ActiveMQ-Camel from ActiveMQ discard b7f9ac1 CAMEL-13149 - Make Camel-JMS use Camel-Activemq instead of ActiveMQ-Camel from ActiveMQ discard 61a21b8 CAMEL-13149 - Regen discard 3877914 CAMEL-13149 - Added Camel-ActiveMQ to kit discard 46633b9 CAMEL-13149 - Move ActiveMQ Camel Component to Camel Repository as Camel-ActiveMQ
[camel] branch revert-2390-patch-4 deleted (was 691ab57)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch revert-2390-patch-4 in repository https://gitbox.apache.org/repos/asf/camel.git. was 691ab57 Revert "[CAMEL-12593] Active deploy profile when deploying" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch eventbus deleted (was 9f5ea33)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch eventbus in repository https://gitbox.apache.org/repos/asf/camel.git. was 9f5ea33 Add JSonArry test case The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch revert-2098-CAMEL-11532 deleted (was 291c546)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch revert-2098-CAMEL-11532 in repository https://gitbox.apache.org/repos/asf/camel.git. was 291c546 Revert "CAMEL-11532 Java DSL enhancement to accept supplier and function arguments (#2098)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch revert-2953-upgrade-xercesj deleted (was 0c9530c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch revert-2953-upgrade-xercesj in repository https://gitbox.apache.org/repos/asf/camel.git. was 0c9530c Revert "Upgrade xercesImpl version" This change permanently discards the following revisions: discard 0c9530c Revert "Upgrade xercesImpl version"
[camel] branch tiny deleted (was f653698)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch tiny in repository https://gitbox.apache.org/repos/asf/camel.git. was f653698 CAMEL-13201: camel-core-minimal - To have core with as few dependencies as possible This change permanently discards the following revisions: discard f653698 CAMEL-13201: camel-core-minimal - To have core with as few dependencies as possible discard 0e5b18f CAMEL-13201: camel-core-minimal - To have core with as few dependencies as possible discard a0b52fe CAMEL-13201: camel-core-minimal - To have core with as few dependencies as possible
[camel] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b03eaca Regen b03eaca is described below commit b03eaca034696be2b2d91f5e26a3affae9568a91 Author: Claus Ibsen AuthorDate: Fri May 31 06:16:28 2019 +0200 Regen --- .../src/main/docs/tokenize-language.adoc | 3 +- .../modules/ROOT/pages/claimCheck-eip.adoc | 41 +++--- .../modules/ROOT/pages/tokenize-language.adoc | 3 +- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/core/camel-base/src/main/docs/tokenize-language.adoc b/core/camel-base/src/main/docs/tokenize-language.adoc index 63937d7..b2cdb73 100644 --- a/core/camel-base/src/main/docs/tokenize-language.adoc +++ b/core/camel-base/src/main/docs/tokenize-language.adoc @@ -17,7 +17,7 @@ see Splitter. === Tokenize Options // language options: START -The Tokenize language supports 10 options, which are listed below. +The Tokenize language supports 11 options, which are listed below. @@ -32,6 +32,7 @@ The Tokenize language supports 10 options, which are listed below. | xml | false | Boolean | Whether the input is XML messages. This option must be set to true if working with XML payloads. | includeTokens | false | Boolean | Whether to include the tokens in the parts when using pairs The default value is false | group | | String | To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes. +| groupDelimiter | | String | Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter. | skipFirst | false | Boolean | To skip the very first element | trim | true | Boolean | Whether to trim the value to remove leading and trailing whitespaces and line breaks |=== diff --git a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc index a3fa60a..2643bfb 100644 --- a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc +++ b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc @@ -20,7 +20,7 @@ The Claim Check EIP supports 5 options which are listed below: |=== | Name | Description | Default | Type | *operation* | *Required* The claim check operation to use. The following operations is supported: Get - Gets (does not remove) the claim check by the given key. GetAndRemove - Gets and remove the claim check by the given key. Set - Sets a new (will override if key already exists) claim check with the given key. Push - Sets a new claim check on the stack (does not use key). Pop - Gets the latest claim check from the stack (does not use key). | | ClaimCheckOperation -| *key* | To use a specific key for claim check id. | | String +| *key* | To use a specific key for claim check id (for dynamic keys use simple language syntax as the key). | | String | *filter* | Specified a filter to control what data gets merging data back from the claim check repository. The following syntax is supported: body - to aggregate the message body attachments - to aggregate all the message attachments headers - to aggregate all the message headers header:pattern - to aggregate all the message headers that matches the pattern. The pattern uses the following rules are applied in this order: exact match, returns true wildcard match (pattern ends with a and [...] | *strategyRef* | To use a custom AggregationStrategy instead of the default implementation. Notice you cannot use both custom aggregation strategy and configure data at the same time. | | String | *strategyMethodName* | This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy. | | String @@ -67,35 +67,30 @@ You can specify multiple rules separated by comma. For example to include the message body and all headers starting with _foo_: -[text] body,header:foo* To only merge back the message body: -[text] body To only merge back the message attachments: -[text] attachments To only merge back headers: -[text] headers To only merge back a header name foo: -[text] header:foo @@ -104,7 +99,7 @@ If the filter rule is specified as empty or as wildcard then everything is merge Notice that when merging back data, then any existing data is overwritten, and any other existing data is preserved. - Fine grained filtering with include and explude pattern + Fine grained filtering with include and exclude pattern The syntax also supports the following prefixes which can be used to specify include,exclude, or remove @@ -129,12 +124,32 @@ You can also instruct to remove headers when merging data back, for example to r Note
[camel] branch camel-2.x updated: Upgrade xercesImpl version
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 e55e806 Upgrade xercesImpl version e55e806 is described below commit e55e8066457dbfb56764392bbf3996a94b35704d Author: Claus Ibsen AuthorDate: Fri May 31 06:24:00 2019 +0200 Upgrade xercesImpl version --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9608524..0036523 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -728,7 +728,7 @@ 3.14 4.5 4.3.13 -2.11.0_1 +2.12.0_1 2.12.0 1.4.01
[camel] branch camel-2.x updated: Upgrade xercesImpl version
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 850b5cc Upgrade xercesImpl version 850b5cc is described below commit 850b5cc9832eee1e8d582971bcde5119a4c09ea1 Author: Tom Cunningham AuthorDate: Thu May 30 17:35:06 2019 -0400 Upgrade xercesImpl version --- parent/pom.xml | 2 +- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5ec7d00..9608524 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -729,7 +729,7 @@ 4.5 4.3.13 2.11.0_1 -2.11.0 +2.12.0 1.4.01 1.3.04 diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 0c6863b..055a4c2 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3961,7 +3961,7 @@ xerces xercesImpl -2.11.0 +2.12.0 diff --git a/pom.xml b/pom.xml index bb03e6d..1a994b8 100644 --- a/pom.xml +++ b/pom.xml @@ -527,7 +527,7 @@ xerces xercesImpl - 2.11.0 + 2.12.0 ant-contrib
[camel] branch revert-2953-upgrade-xercesj created (now 0c9530c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch revert-2953-upgrade-xercesj in repository https://gitbox.apache.org/repos/asf/camel.git. at 0c9530c Revert "Upgrade xercesImpl version" This branch includes the following new commits: new 0c9530c Revert "Upgrade xercesImpl version" The 1 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.
[camel] 01/01: Revert "Upgrade xercesImpl version"
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch revert-2953-upgrade-xercesj in repository https://gitbox.apache.org/repos/asf/camel.git commit 0c9530cb2ab0fcf598103f0890da1ae5eed8dff1 Author: Claus Ibsen AuthorDate: Fri May 31 06:22:51 2019 +0200 Revert "Upgrade xercesImpl version" This reverts commit 850b5cc9832eee1e8d582971bcde5119a4c09ea1. --- parent/pom.xml | 2 +- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9608524..5ec7d00 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -729,7 +729,7 @@ 4.5 4.3.13 2.11.0_1 -2.12.0 +2.11.0 1.4.01 1.3.04 diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 055a4c2..0c6863b 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3961,7 +3961,7 @@ xerces xercesImpl -2.12.0 +2.11.0 diff --git a/pom.xml b/pom.xml index 1a994b8..bb03e6d 100644 --- a/pom.xml +++ b/pom.xml @@ -527,7 +527,7 @@ xerces xercesImpl - 2.12.0 + 2.11.0 ant-contrib
[camel] branch master updated: CAMEL-13597: Tokenizer with grouping can now specify which delimiter to use instead of the token itself.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e92b84b CAMEL-13597: Tokenizer with grouping can now specify which
delimiter to use instead of the token itself.
e92b84b is described below
commit e92b84bf1ed14c6373eafd330ef97032583d4de6
Author: Claus Ibsen
AuthorDate: Thu May 30 21:49:12 2019 +0200
CAMEL-13597: Tokenizer with grouping can now specify which delimiter to use
instead of the token itself.
---
.../camel/language/tokenizer/TokenizeLanguage.java | 12 +-
.../org/apache/camel/builder/ExpressionClause.java | 13 ++
.../camel/builder/ExpressionClauseSupport.java | 16 +++
.../camel/model/language/TokenizerExpression.java | 15 +++
core/camel-core/src/main/schema/tokenize.json | 1 +
.../processor/SplitTokenizerRegexpGroupTest.java | 50 ++
6 files changed, 106 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
b/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index 2e3899d..72934d7 100644
---
a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++
b/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -48,6 +48,7 @@ public class TokenizeLanguage implements Language,
IsSingleton {
private boolean xml;
private boolean includeTokens;
private String group;
+private String groupDelimiter;
private boolean skipFirst;
public static Expression tokenize(String token) {
@@ -133,7 +134,8 @@ public class TokenizeLanguage implements Language,
IsSingleton {
if (isXml()) {
answer = ExpressionBuilder.groupXmlIteratorExpression(answer,
group);
} else {
-answer = ExpressionBuilder.groupIteratorExpression(answer,
token, group, skipFirst);
+String delim = groupDelimiter != null ? groupDelimiter : token;
+answer = ExpressionBuilder.groupIteratorExpression(answer,
delim, group, skipFirst);
}
}
@@ -211,6 +213,14 @@ public class TokenizeLanguage implements Language,
IsSingleton {
this.group = group;
}
+public String getGroupDelimiter() {
+return groupDelimiter;
+}
+
+public void setGroupDelimiter(String groupDelimiter) {
+this.groupDelimiter = groupDelimiter;
+}
+
public boolean isSkipFirst() {
return skipFirst;
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 5f49dfe..538a32d 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -668,6 +668,19 @@ public class ExpressionClause implements Expression,
Predicate {
* Evaluates a token expression on the message body
*
* @param token the token
+ * @param regex whether the token is a regular expression or not
+ * @param group to group by the given number
+ * @param skipFirst whether to skip the first element
+ * @return the builder to continue processing the DSL
+ */
+public T tokenize(String token, boolean regex, int group, String
groupDelimiter, boolean skipFirst) {
+return delegate.tokenize(token, null, regex, "" + group,
groupDelimiter, skipFirst);
+}
+
+/**
+ * Evaluates a token expression on the message body
+ *
+ * @param token the token
* @param group to group by the given number
* @return the builder to continue processing the DSL
*/
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index a077cec..58a9bd0 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -690,11 +690,27 @@ public class ExpressionClauseSupport {
* @return the builder to continue processing the DSL
*/
public T tokenize(String token, String headerName, boolean regex, String
group, boolean skipFirst) {
+return tokenize(token, headerName, regex, group, null, skipFirst);
+}
+
+/**
+ * Evaluates a token expression on the given header
+ *
+ * @param token the token
+ * @param headerName name of header to tokenize
+ * @param regex whether the token is a regular expression or not
+ * @param group to group by number of parts
+ * @param groupDelimiter delimiter to use when
[camel] branch master updated: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5273249 CAMEL-13557: Add property binding support to make it
convenient to configure components and whatnot.
5273249 is described below
commit 52732499f9bb828838bb4010e2b38a2e593b38e5
Author: Claus Ibsen
AuthorDate: Thu May 30 15:40:18 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
.../camel/reifier/rest/RestBindingReifier.java | 6 +--
.../org/apache/camel/support/DefaultComponent.java | 4 --
.../org/apache/camel/support/DefaultEndpoint.java | 3 --
.../org/apache/camel/support/EndpointHelper.java | 42 ---
.../apache/camel/support/IntrospectionSupport.java | 6 ++-
.../camel/support/PropertyBindingSupport.java | 49 ++
6 files changed, 48 insertions(+), 62 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
index b088f4f..e2788d0 100644
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
+++
b/core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
@@ -27,8 +27,8 @@ import org.apache.camel.processor.RestBindingAdvice;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.support.PropertyBindingSupport;
public class RestBindingReifier {
@@ -200,9 +200,7 @@ public class RestBindingReifier {
}
}
-// set reference properties first as they use # syntax that fools
the regular properties setter
-EndpointHelper.setReferenceProperties(context, dataFormat, copy);
-EndpointHelper.setProperties(context, dataFormat, copy);
+PropertyBindingSupport.bindProperties(context, dataFormat, copy);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
index d6f1583..00819bc 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
@@ -311,10 +311,6 @@ public abstract class DefaultComponent extends
ServiceSupport implements Compone
* @param parametersproperties to set
*/
protected void setProperties(CamelContext camelContext, Object bean,
Map parameters) throws Exception {
-// set reference properties first as they use # syntax that fools the
regular properties setter
-// TODO: We should find out the weird camel-cxf error where we need to
do this, as we can put this logic into PropertyBindingSupport
-EndpointHelper.setReferenceProperties(camelContext, bean, parameters);
-
if (basicPropertyBinding) {
// use basic binding
PropertyBindingSupport.build()
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
index aadc56b..cb11ab0 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
@@ -379,9 +379,6 @@ public abstract class DefaultEndpoint extends
ServiceSupport implements Endpoint
* @param parameters properties to set
*/
protected void setProperties(Object bean, Map parameters)
throws Exception {
-// set reference properties first as they use # syntax that fools the
regular properties setter
-EndpointHelper.setReferenceProperties(camelContext, bean, parameters);
-
if (basicPropertyBinding) {
// use basic binding
PropertyBindingSupport.build()
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
index c19c240..f4b973c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
@@ -29,13 +29,10 @@ import org.apache.camel.DelegateEndpoint;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
[camel] branch master updated (8d714fa -> e86896f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 8d714fa CAMEL-13599: Claim check - Allow to use dynamic key via simple language new 7680c2a CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot. new db1738e CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot. new e86896f CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot. The 3 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: .../support/PropertyBindingSupportListTest.java| 206 + .../support/PropertyBindingSupportMapTest.java | 205 .../apache/camel/support/IntrospectionSupport.java | 62 ++- .../camel/support/PropertyBindingSupport.java | 43 - 4 files changed, 511 insertions(+), 5 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportListTest.java create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
[camel] 01/03: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7680c2a6ab930564c18bdea2070a9d1dc98b2bb6
Author: Claus Ibsen
AuthorDate: Thu May 30 12:10:42 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
.../support/PropertyBindingSupportMapTest.java | 186 +
.../apache/camel/support/IntrospectionSupport.java | 36 +++-
.../camel/support/PropertyBindingSupport.java | 27 ++-
3 files changed, 244 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
new file mode 100644
index 000..561d9dc
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
@@ -0,0 +1,186 @@
+/*
+ * 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.support;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.PropertyBindingException;
+import org.junit.Test;
+
+/**
+ * Unit test for PropertyBindingSupport
+ */
+public class PropertyBindingSupportMapTest extends ContextTestSupport {
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+CamelContext context = super.createCamelContext();
+
+Company work1 = new Company();
+work1.setId(123);
+work1.setName("Acme");
+context.getRegistry().bind("company1", work1);
+Company work2 = new Company();
+work2.setId(456);
+work2.setName("Acme 2");
+context.getRegistry().bind("company2", work2);
+
+Properties placeholders = new Properties();
+placeholders.put("companyName", "Acme");
+placeholders.put("committer", "rider");
+context.getPropertiesComponent().setInitialProperties(placeholders);
+
+return context;
+}
+
+@Test
+public void testPropertiesMap() throws Exception {
+Foo foo = new Foo();
+
+Map prop = new LinkedHashMap<>();
+prop.put("name", "James");
+prop.put("bar.age", "33");
+prop.put("bar.{{committer}}", "true");
+prop.put("bar.gold-customer", "true");
+prop.put("bar.works[acme]", "#bean:company1");
+prop.put("bar.works[burger]", "#bean:company2");
+
+PropertyBindingSupport.bindProperties(context, foo, prop);
+
+assertEquals("James", foo.getName());
+assertEquals(33, foo.getBar().getAge());
+assertTrue(foo.getBar().isRider());
+assertTrue(foo.getBar().isGoldCustomer());
+assertEquals(2, foo.getBar().getWorks().size());
+assertEquals(123, foo.getBar().getWorks().get("acme").getId());
+assertEquals("Acme", foo.getBar().getWorks().get("acme").getName());
+assertEquals(456, foo.getBar().getWorks().get("burger").getId());
+assertEquals("Acme 2",
foo.getBar().getWorks().get("burger").getName());
+}
+
+@Test
+public void testPropertiesMapNested() throws Exception {
+Foo foo = new Foo();
+
+Map prop = new LinkedHashMap<>();
+prop.put("name", "James");
+prop.put("bar.age", "33");
+prop.put("bar.{{committer}}", "true");
+prop.put("bar.gold-customer", "true");
+prop.put("bar.works[acme]", "#bean:company1");
+prop.put("bar.works[acme].id", "666");
+prop.put("bar.works[burger]", "#bean:company2");
+prop.put("bar.works[burger].name", "I changed this");
+
+PropertyBindingSupport.bindProperties(context, foo, prop);
+
+assertEquals("James", foo.getName());
+assertEquals(33, foo.getBar().getAge());
+assertTrue(foo.getBar().isRider());
+assertTrue(foo.getBar().isGoldCustomer());
+assertEquals(2, foo.getBar().getWorks().size());
+assertEquals(666, foo.getBar().getWorks().get("acme").getId());
+
[camel] 03/03: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e86896fa284842d5e66120d1390ab1888aa408e2
Author: Claus Ibsen
AuthorDate: Thu May 30 14:28:17 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
...st.java => PropertyBindingSupportListTest.java} | 67 +++---
.../support/PropertyBindingSupportMapTest.java | 2 +-
.../apache/camel/support/IntrospectionSupport.java | 40 ++---
.../camel/support/PropertyBindingSupport.java | 29 --
4 files changed, 91 insertions(+), 47 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportListTest.java
similarity index 70%
copy from
core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
copy to
core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportListTest.java
index f46e976..5579c64 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportListTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.support;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -28,7 +29,7 @@ import org.junit.Test;
/**
* Unit test for PropertyBindingSupport
*/
-public class PropertyBindingSupportMapTest extends ContextTestSupport {
+public class PropertyBindingSupportListTest extends ContextTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -52,7 +53,7 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
}
@Test
-public void testPropertiesMap() throws Exception {
+public void testPropertiesList() throws Exception {
Foo foo = new Foo();
Map prop = new LinkedHashMap<>();
@@ -60,8 +61,8 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
prop.put("bar.age", "33");
prop.put("bar.{{committer}}", "true");
prop.put("bar.gold-customer", "true");
-prop.put("bar.works[acme]", "#bean:company1");
-prop.put("bar.works[burger]", "#bean:company2");
+prop.put("bar.works[0]", "#bean:company1");
+prop.put("bar.works[1]", "#bean:company2");
PropertyBindingSupport.bindProperties(context, foo, prop);
@@ -70,14 +71,14 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
assertTrue(foo.getBar().isRider());
assertTrue(foo.getBar().isGoldCustomer());
assertEquals(2, foo.getBar().getWorks().size());
-assertEquals(123, foo.getBar().getWorks().get("acme").getId());
-assertEquals("Acme", foo.getBar().getWorks().get("acme").getName());
-assertEquals(456, foo.getBar().getWorks().get("burger").getId());
-assertEquals("Acme 2",
foo.getBar().getWorks().get("burger").getName());
+assertEquals(123, foo.getBar().getWorks().get(0).getId());
+assertEquals("Acme", foo.getBar().getWorks().get(0).getName());
+assertEquals(456, foo.getBar().getWorks().get(1).getId());
+assertEquals("Acme 2", foo.getBar().getWorks().get(1).getName());
}
@Test
-public void testPropertiesMapNested() throws Exception {
+public void testPropertiesListNested() throws Exception {
Foo foo = new Foo();
Map prop = new LinkedHashMap<>();
@@ -85,10 +86,10 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
prop.put("bar.age", "33");
prop.put("bar.{{committer}}", "true");
prop.put("bar.gold-customer", "true");
-prop.put("bar.works[acme]", "#bean:company1");
-prop.put("bar.works[acme].id", "666");
-prop.put("bar.works[burger]", "#bean:company2");
-prop.put("bar.works[burger].name", "I changed this");
+prop.put("bar.works[0]", "#bean:company1");
+prop.put("bar.works[0].id", "666");
+prop.put("bar.works[1]", "#bean:company2");
+prop.put("bar.works[1].name", "I changed this");
PropertyBindingSupport.bindProperties(context, foo, prop);
@@ -97,47 +98,47 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
assertTrue(foo.getBar().isRider());
assertTrue(foo.getBar().isGoldCustomer());
assertEquals(2, foo.getBar().getWorks().size());
-assertEquals(666, foo.getBar().getWorks().get("acme").getId());
-assertEquals("Acme", foo.getBar().getWorks().get("acme").getName());
-assertEquals(456, foo.getBar().getWorks().get("burger").getId());
-assertEquals("I changed this",
[camel] 02/03: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db1738e407c0159c5fe9181d3811a62c85377b69
Author: Claus Ibsen
AuthorDate: Thu May 30 13:56:34 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
.../camel/support/PropertyBindingSupportMapTest.java | 19 +++
.../apache/camel/support/PropertyBindingSupport.java | 5 ++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
index 561d9dc..f46e976 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapTest.java
@@ -104,6 +104,25 @@ public class PropertyBindingSupportMapTest extends
ContextTestSupport {
}
@Test
+public void testPropertiesMapFirst() throws Exception {
+Bar bar = new Bar();
+
+Map prop = new LinkedHashMap<>();
+prop.put("works[acme]", "#bean:company1");
+prop.put("works[acme].id", "666");
+prop.put("works[burger]", "#bean:company2");
+prop.put("works[burger].name", "I changed this");
+
+PropertyBindingSupport.bindProperties(context, bar, prop);
+
+assertEquals(2, bar.getWorks().size());
+assertEquals(666, bar.getWorks().get("acme").getId());
+assertEquals("Acme", bar.getWorks().get("acme").getName());
+assertEquals(456, bar.getWorks().get("burger").getId());
+assertEquals("I changed this", bar.getWorks().get("burger").getName());
+}
+
+@Test
public void testPropertiesNotMap() throws Exception {
Foo foo = new Foo();
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 1781c79..760029c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -36,6 +36,7 @@ import static
org.apache.camel.support.IntrospectionSupport.findSetterMethods;
*
* property placeholders - Keys and values using Camels property
placeholder will be resolved
* nested - Properties can be nested using the dot syntax (OGNL and
builder pattern using with as prefix), eg foo.bar=123
+ * keys with map - Properties can lookup in Map's using map
syntax, eg foo[bar] where foo is the name of the property that is a Map
instance, and bar is the name of the key.
* reference by bean id - Values can refer to other beans in the
registry by prefixing with #nean: eg #bean:myBean
* reference by type - Values can refer to singleton beans by their
type in the registry by prefixing with #type: syntax, eg
#type:com.foo.MyClassType
* autowire by type - Values can refer to singleton beans by auto
wiring by setting the value to #autowired
@@ -45,7 +46,7 @@ import static
org.apache.camel.support.IntrospectionSupport.findSetterMethods;
*/
public final class PropertyBindingSupport {
-// TODO: Add support for Map/List in keys
+// TODO: Add support for List in keys
/**
* To use a fluent builder style to configure this property binding
support.
@@ -360,8 +361,6 @@ public final class PropertyBindingSupport {
}
}
-// TODO: support key without nested dots
-
// if name has dot then we need to OGNL walk it
if (nesting) {
if (name.indexOf('.') > 0) {
[camel-k] 01/02: chore(doc): rebrand camel k
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 79eb057ae7b1daaa4ab4ee47e6cc7db3f86fdf82 Author: nferraro AuthorDate: Fri Apr 19 10:13:13 2019 +0200 chore(doc): rebrand camel k --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 2fb739d..0b0d09f 100644 --- a/README.adoc +++ b/README.adoc @@ -7,7 +7,7 @@ image:https://godoc.org/github.com/apache/camel-k?status.svg["GoDoc;, link="http image:https://img.shields.io/github/license/openshift/origin.svg?maxAge=2592000["Licensed under Apache License version 2.0", link="https://www.apache.org/licenses/LICENSE-2.0;] image:https://badges.gitter.im/apache/camel-k.png["Chat on Gitter", link="https://gitter.im/apache/camel-k;] -Apache Camel K (a.k.a. Kamel) is a lightweight integration framework built from Apache Camel that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. +Apache Camel K is lightweight integration platform, born on Kubernetes, with serverless superpowers. [[getting-started]] == Getting Started
[camel-k] branch master updated (c66566a -> b902606)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from c66566a Update the cluster-setup document for installing knative on minishift new 79eb057 chore(doc): rebrand camel k new b902606 Fix typo 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: README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-k] 02/02: Fix typo
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit b9026065c8911aad5671060ad2f619c68c7a239e Author: nferraro AuthorDate: Mon Apr 29 16:33:57 2019 +0200 Fix typo --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 0b0d09f..0ab236a 100644 --- a/README.adoc +++ b/README.adoc @@ -7,7 +7,7 @@ image:https://godoc.org/github.com/apache/camel-k?status.svg["GoDoc;, link="http image:https://img.shields.io/github/license/openshift/origin.svg?maxAge=2592000["Licensed under Apache License version 2.0", link="https://www.apache.org/licenses/LICENSE-2.0;] image:https://badges.gitter.im/apache/camel-k.png["Chat on Gitter", link="https://gitter.im/apache/camel-k;] -Apache Camel K is lightweight integration platform, born on Kubernetes, with serverless superpowers. +Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. [[getting-started]] == Getting Started
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34236 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34235 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel-k] branch master updated: Update the cluster-setup document for installing knative on minishift
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new c66566a Update the cluster-setup document for installing knative on minishift c66566a is described below commit c66566af3aa8f99426b72a22b04e7748b6c30333 Author: Willem Jiang AuthorDate: Thu May 30 17:26:37 2019 +0800 Update the cluster-setup document for installing knative on minishift --- docs/cluster-setup.adoc | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/cluster-setup.adoc b/docs/cluster-setup.adoc index 4490e42..2083965 100644 --- a/docs/cluster-setup.adoc +++ b/docs/cluster-setup.adoc @@ -40,8 +40,8 @@ minikube addons enable registry The following section is optional and needed if and only if you are going to use Knative with Camel K. Run the following commands to install the Knative components: -[#install-knative] -== Install Knative +[#install-knative-on-minikube] +== Install Knative on Minikube [source,bash,linenums,subs="+macros,+attributes"] @@ -116,5 +116,11 @@ Then you can start the cluster with: minishift start ``` -You can now proceed to link:/README.adoc[install Camel K]. +The following section is optional and needed if and only if you are going to use Knative with Camel K. Run the following commands to install the Knative components: + +[#install-knative-on-minishift] +== Install Knative on Minishift +Please follow the instructions in the https://knative.dev/docs/install/knative-with-minishift/[official doc] of Knative to install the Knative on Minishift. + +You can now proceed to link:/README.adoc[install Camel K].
[camel-k] branch master updated: chore(doc): add missing license header
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new 7b11a2a chore(doc): add missing license header 7b11a2a is described below commit 7b11a2ae50daed6a19bb08dd5a7c668e2d535144 Author: nferraro AuthorDate: Thu May 30 10:25:56 2019 +0200 chore(doc): add missing license header --- pkg/platform/operator.go | 17 + 1 file changed, 17 insertions(+) diff --git a/pkg/platform/operator.go b/pkg/platform/operator.go index 4431364..f180cd9 100644 --- a/pkg/platform/operator.go +++ b/pkg/platform/operator.go @@ -1,3 +1,20 @@ +/* +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 platform import (
[camel] branch master updated: CAMEL-13599: Claim check - Allow to use dynamic key via simple language
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8d714fa CAMEL-13599: Claim check - Allow to use dynamic key via
simple language
8d714fa is described below
commit 8d714faaf1d12b60ae701da1544db708881f8d1c
Author: Claus Ibsen
AuthorDate: Thu May 30 09:58:46 2019 +0200
CAMEL-13599: Claim check - Allow to use dynamic key via simple language
---
.../camel/processor/ClaimCheckProcessor.java | 29 +++
.../src/main/docs/eips/claimCheck-eip.adoc | 41 ++-
.../apache/camel/model/ClaimCheckDefinition.java | 2 +-
.../ClaimCheckEipDynamicKeyGetSetTest.java | 59 ++
4 files changed, 108 insertions(+), 23 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
index 8667f62..587fed6 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
@@ -21,11 +21,13 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
import org.apache.camel.impl.engine.DefaultClaimCheckRepository;
import org.apache.camel.spi.ClaimCheckRepository;
import org.apache.camel.spi.IdAware;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.support.LanguageSupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
@@ -44,6 +46,7 @@ public class ClaimCheckProcessor extends
AsyncProcessorSupport implements IdAwar
private String operation;
private AggregationStrategy aggregationStrategy;
private String key;
+private Expression keyExpression;
private String filter;
@Override
@@ -108,18 +111,20 @@ public class ClaimCheckProcessor extends
AsyncProcessorSupport implements IdAwar
}
try {
+String claimKey = keyExpression.evaluate(exchange, String.class);
+
if ("Set".equals(operation)) {
// copy exchange, and do not share the unit of work
Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
false);
-boolean addedNew = repo.add(key, copy);
+boolean addedNew = repo.add(claimKey, copy);
if (addedNew) {
-log.debug("Add: {} -> {}", key, copy);
+log.debug("Add: {} -> {}", claimKey, copy);
} else {
-log.debug("Override: {} -> {}", key, copy);
+log.debug("Override: {} -> {}", claimKey, copy);
}
} else if ("Get".equals(operation)) {
-Exchange copy = repo.get(key);
-log.debug("Get: {} -> {}", key, exchange);
+Exchange copy = repo.get(claimKey);
+log.debug("Get: {} -> {}", claimKey, exchange);
if (copy != null) {
Exchange result = aggregationStrategy.aggregate(exchange,
copy);
if (result != null) {
@@ -127,8 +132,8 @@ public class ClaimCheckProcessor extends
AsyncProcessorSupport implements IdAwar
}
}
} else if ("GetAndRemove".equals(operation)) {
-Exchange copy = repo.getAndRemove(key);
-log.debug("GetAndRemove: {} -> {}", key, exchange);
+Exchange copy = repo.getAndRemove(claimKey);
+log.debug("GetAndRemove: {} -> {}", claimKey, exchange);
if (copy != null) {
// prepare the exchanges for aggregation
ExchangeHelper.prepareAggregation(exchange, copy);
@@ -140,11 +145,11 @@ public class ClaimCheckProcessor extends
AsyncProcessorSupport implements IdAwar
} else if ("Push".equals(operation)) {
// copy exchange, and do not share the unit of work
Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
false);
-log.debug("Push: {} -> {}", key, copy);
+log.debug("Push: {} -> {}", claimKey, copy);
repo.push(copy);
} else if ("Pop".equals(operation)) {
Exchange copy = repo.pop();
-log.debug("Pop: {} -> {}", key, exchange);
+log.debug("Pop: {} -> {}", claimKey, exchange);
if (copy != null) {
// prepare the exchanges for aggregation
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit b13202811cd7b6ad8f791ff91e4982b32b610f53 Author: Andrea Cosentino AuthorDate: Thu May 30 10:17:20 2019 +0200 Regen --- .../modules/ROOT/pages/cbor-dataformat.adoc| 26 ++ 1 file changed, 26 insertions(+) diff --git a/docs/components/modules/ROOT/pages/cbor-dataformat.adoc b/docs/components/modules/ROOT/pages/cbor-dataformat.adoc index 60a03d6..bf7e263 100644 --- a/docs/components/modules/ROOT/pages/cbor-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/cbor-dataformat.adoc @@ -69,6 +69,32 @@ The component supports 8 options, which are listed below. |=== // spring-boot-auto-configure options: END + Using CBOR in Spring DSL + +When using Data Format in Spring DSL you need to +declare the data formats first. This is done in the *DataFormats* XML +tag. + +[source,xml] +- + + + + +- + +And then you can refer to this id in the route: + +[source,xml] +- + + + + + +- + ### Dependencies [source,java]
[camel] 01/02: Camel-CBOR: More docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 11f2b29a953bd7d6f26e91f8bcde62e9d78d5d91 Author: Andrea Cosentino AuthorDate: Thu May 30 10:08:19 2019 +0200 Camel-CBOR: More docs --- .../camel-cbor/src/main/docs/cbor-dataformat.adoc | 26 ++ 1 file changed, 26 insertions(+) diff --git a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc index 60a03d6..bf7e263 100644 --- a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc +++ b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc @@ -69,6 +69,32 @@ The component supports 8 options, which are listed below. |=== // spring-boot-auto-configure options: END + Using CBOR in Spring DSL + +When using Data Format in Spring DSL you need to +declare the data formats first. This is done in the *DataFormats* XML +tag. + +[source,xml] +- + + + + +- + +And then you can refer to this id in the route: + +[source,xml] +- + + + + + +- + ### Dependencies [source,java]
[camel] branch master updated (166cb6f -> b132028)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 166cb6f Regen new 11f2b29 Camel-CBOR: More docs new b132028 Regen 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: .../camel-cbor/src/main/docs/cbor-dataformat.adoc | 26 ++ .../modules/ROOT/pages/cbor-dataformat.adoc| 26 ++ 2 files changed, 52 insertions(+)
[camel] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 166cb6f Regen
166cb6f is described below
commit 166cb6f2e0af38c80e1700e43b9686cac6c8b68d
Author: Claus Ibsen
AuthorDate: Thu May 30 09:35:33 2019 +0200
Regen
---
docs/components/modules/ROOT/pages/soroush-component.adoc | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/soroush-component.adoc
b/docs/components/modules/ROOT/pages/soroush-component.adoc
index 472507a..ef91a0c 100644
--- a/docs/components/modules/ROOT/pages/soroush-component.adoc
+++ b/docs/components/modules/ROOT/pages/soroush-component.adoc
@@ -3,9 +3,6 @@
*Available as of Camel version 3.0*
-*Available as of Camel version 3.0*
-
-
The *Soroush* component provides access to the
https://soroush-app.ir/developer.html[Soroush Bot API].
It allows a Camel-based application to send and receive messages by acting as
a Bot, i.e. participating in direct conversation with normal users and send and
receive message and files
@@ -51,7 +48,7 @@ attachments if provided in the message
(`SoroushMessage.file`, `SoroushMessage.
and store the urls in the message (`SoroushMessage.fileUrl`,
`SoroushMessage.thumbnailUrl`).
|===
-
+### Options
// component options: START
The Soroush component supports 3 options, which are listed below.
@@ -222,7 +219,7 @@ from("soroush:getMessage/YourAuthorizationToken")
.to("soroush:sendMessage/YourAuthorizationToken");
-
-== Auto Upload Attachments
+ Auto Upload Attachments
This endpoint can help you to automatically upload files and thumbnails of a
message to the server
and set `fileUrl` and `thumbnailUrl` of that message to proper values taken
from Soroush Upload File Api.
The only thing you need to do is setting `SoroushMessage.file` and
`SoroushMessage.thumbnail` properties.
[camel] branch master updated: Upgrade Json-schema-validator to version 1.0.11
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 65b1e58 Upgrade Json-schema-validator to version 1.0.11 65b1e58 is described below commit 65b1e58a1e6bc1f3087b95ec47b91486e5a7d26d Author: Andrea Cosentino AuthorDate: Thu May 30 08:53:50 2019 +0200 Upgrade Json-schema-validator to version 1.0.11 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b5c1913..f0b8354 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -517,7 +517,7 @@ 4.1.36.Final 2.0.3 4.0.56.Final - 1.0.8 + 1.0.11 0.5_1 2.6
[camel] branch master updated: Fix mongodb tests
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 124bd58 Fix mongodb tests
new 9a94926 Merge pull request #2951 from DenisIstomin/fix-mongodb-tests
124bd58 is described below
commit 124bd58b55dbe881662a5c3bba46fe75a2b8f520
Author: Denis Istomin
AuthorDate: Wed May 29 21:36:06 2019 +0500
Fix mongodb tests
---
.../apache/camel/component/mongodb3/MongoDbTailingProcess.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingProcess.java
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingProcess.java
index 813ee7c7..3e67dc1 100644
---
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingProcess.java
+++
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingProcess.java
@@ -178,6 +178,15 @@ public class MongoDbTailingProcess implements Runnable {
if (keepRunning) {
LOG.debug("Cursor not found exception from MongoDB, will
regenerate cursor. This is normal behaviour with tailable cursors.", e);
}
+} catch (IllegalStateException e) {
+// cursor.hasNext() opens socket and waiting for data
+// it throws exception when cursor is closed in another thread
+// there is no way to stop hasNext() before closing cursor
+if (keepRunning) {
+throw e;
+} else {
+LOG.debug("Cursor closed exception from MongoDB, will
regenerate cursor. This is normal behaviour with tailable cursors.", e);
+}
}
// the loop finished, persist the lastValue just in case we are
shutting
[camel] branch master updated: Upgrade Mockito to version 2.28.2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 3eb7298 Upgrade Mockito to version 2.28.2 3eb7298 is described below commit 3eb7298ef152c45b3c958fc8a4b8d236adc3 Author: Andrea Cosentino AuthorDate: Thu May 30 08:09:05 2019 +0200 Upgrade Mockito to version 2.28.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0f0a5fb..b5c1913 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -497,7 +497,7 @@ 0.9.5 1.9 0.0.17 -2.28.1 +2.28.2 3.10.2 1.5.0 1.15
